qbit/xin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

all: attempt to fix pythonPackages.dataset issue

Browse Source
This commit is contained in:
Aaron Bieber 2023-03-17 12:15:42 -06:00
parent 71008a97a0
commit 29bfa3330e
No known key found for this signature in database
3 changed files with 52 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
flake.lock
View File

@ -60,11 +60,11 @@
}, },
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1676283394, "lastModified": 1678901627,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -339,11 +339,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1678803540, "lastModified": 1678944041,
"narHash": "sha256-nHCi/KLdawIyDW68VPqBchIFvwyVmJlq9MJFGzRq4tc=", "narHash": "sha256-Mdl+pMrnbphMfRPMRqf9anpIvzqhVkNtsQNZ3NJ/eLo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b0bdfe19cde52b55c811fb05b22dde0cf7f6a1d8", "rev": "8914c044050cf975209c87d26690eeac7a27ca12",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -452,11 +452,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1678852289, "lastModified": 1679016989,
"narHash": "sha256-tWthwF/grWehpRjxpCTCs2KYynvxFKyKv2abO91GwVE=", "narHash": "sha256-duyz4fwtCuS32vNaGTzlMMsJ2prgNFtKVZCQK88DrnE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1a8edfe192baf0775391ce520092db3c37ff5035", "rev": "6a88bba059564e521acd1b0e811939f12369e3e8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -467,11 +467,11 @@
}, },
"unstableSmall": { "unstableSmall": {
"locked": { "locked": {
"lastModified": 1678780369, "lastModified": 1678951128,
"narHash": "sha256-D8wM0K1EkWLwbUu9fohC57+n89zC9qQ3hdC9Bys5GYw=", "narHash": "sha256-UcfF8/GyllRG/kfOcW/pr9s+YdoND430umc/MkfWpdk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1474943fd91fbe5567f7582acf568e0f999f4af1", "rev": "bf209075b7584ef4fe74db23a86f719555d31d49",
"type": "github" "type": "github"
}, },
"original": { "original": {

29
overlays/default.nix
View File

@ -1,4 +1,4 @@
{ self, config, pkgs, lib, isUnstable, ... }: { pkgs, lib, isUnstable, ... }:
let let
openssh = import ./openssh.nix; openssh = import ./openssh.nix;
tailscale = import ./tailscale.nix; tailscale = import ./tailscale.nix;
@ -9,6 +9,33 @@ in {
openssh openssh
tailscale tailscale
(self: super: {
python310 = super.python310.override {
packageOverrides = python-self: python-super: {
dataset = python-super.dataset.overrideAttrs (old: {
src = python-super.fetchFromGitHub {
owner = "pudo";
repo = "dataset";
rev = "0757b5010b600a66ed07fbb06a0e86c7bb0e09bc";
hash = "sha256-BfIGQvXKlsydV3p93/qLYtbVujTNWqWfMg16/aENHks=";
};
prePatch = ''
substituteInPlace ./setup.py --replace "sqlalchemy >= 1.3.2, < 2.0.0" \
"sqlalchemy >= 1.3.2, <= 2.0.4"
'';
patch = [
(python-super.fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/pudo/dataset/pull/415.patch";
hash = "sha256-dz380ws4801lW669sOfshU5ZoUTmILkamwRgYCDZzAM=";
})
];
});
};
};
})
# https://github.com/NixOS/nixpkgs/pull/213613 # https://github.com/NixOS/nixpkgs/pull/213613
(self: super: { (self: super: {
tidal-hifi = super.tidal-hifi.overrideAttrs (old: rec { tidal-hifi = super.tidal-hifi.overrideAttrs (old: rec {

19
pkgs/promnesia.nix
View File

@ -1,7 +1,8 @@
{ lib, buildPythonPackage, fetchPypi, beautifulsoup4, fastapi, httptools, pytest { lib, buildPythonPackage, fetchFromGitHub, beautifulsoup4, fastapi, httptools
, logzero, lxml, mistletoe, more-itertools, mypy, pytz, setuptools, appdirs , pytest, logzero, lxml, mistletoe, more-itertools, mypy, pytz, setuptools
, sqlalchemy, tzlocal, urlextract, uvicorn, uvloop, watchfiles, websockets , appdirs, sqlalchemy, tzlocal, urlextract, uvicorn, uvloop, watchfiles
, orjson, pandas, simplejson, setuptools-scm, decorator, geopy, pkgs, ... }: , websockets, orjson, pandas, simplejson, setuptools-scm, decorator, geopy, pkgs
, ... }:
with pkgs; with pkgs;
let let
hpi = pkgs.python3Packages.callPackage ./hpi.nix { inherit pkgs; }; hpi = pkgs.python3Packages.callPackage ./hpi.nix { inherit pkgs; };
@ -12,11 +13,15 @@ in buildPythonPackage rec {
pname = "promnesia"; pname = "promnesia";
version = "1.1.20230129"; version = "1.1.20230129";
src = fetchPypi { src = fetchFromGitHub {
inherit pname version; owner = "karlicoss";
sha256 = "sha256-T6sayrPkz8I0u11ZvFbkDdOyVodbaTVkRzLib5lMX+Q="; repo = pname;
rev = "c4a7b47e198a3822dd540968c5a8e6b95ab51b53";
hash = "sha256-QMqvqspuqkyIsz05aA1xObT0tKaJmbts3Cn3O9rlQ1k=";
}; };
SETUPTOOLS_SCM_PRETEND_VERSION = version;
doCheck = true; doCheck = true;
nativeBuildInputs = [ setuptools-scm ]; nativeBuildInputs = [ setuptools-scm ];