colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

pkgs: fix python3Packages.sane-lib eval outside of flake (i.e. NUR)

Browse Source
This commit is contained in:
Colin
2023-06-26 01:25:46 +00:00
parent 8c586bd0db
commit 7aa0c5e3ea
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/default.nix
View File

@@ -10,8 +10,9 @@ let
lib = pkgs.lib; lib = pkgs.lib;
unpatched = pkgs; unpatched = pkgs;
pythonPackagesOverlay = py-final: py-prev: import ./python-packages { pythonPackagesOverlayFor = pkgs: py-final: py-prev: import ./python-packages {
inherit (py-final) callPackage; inherit (py-final) callPackage;
inherit pkgs;
}; };
final' = if final != null then final else pkgs.appendOverlays [(_: _: sane)]; final' = if final != null then final else pkgs.appendOverlays [(_: _: sane)];
sane = with final'; { sane = with final'; {
@@ -103,12 +104,12 @@ let
### PYTHON PACKAGES ### PYTHON PACKAGES
pythonPackagesExtensions = (unpatched.pythonPackagesExtensions or []) ++ [ pythonPackagesExtensions = (unpatched.pythonPackagesExtensions or []) ++ [
pythonPackagesOverlay (pythonPackagesOverlayFor final')
]; ];
# when this scope's applied as an overlay pythonPackagesExtensions is propagated as desired. # when this scope's applied as an overlay pythonPackagesExtensions is propagated as desired.
# but when freestanding (e.g. NUR), it never gets plumbed into the outer pkgs, so we have to do that explicitly. # but when freestanding (e.g. NUR), it never gets plumbed into the outer pkgs, so we have to do that explicitly.
python3 = unpatched.python3.override { python3 = unpatched.python3.override {
packageOverrides = pythonPackagesOverlay; packageOverrides = pythonPackagesOverlayFor final';
}; };
}; };
in sane in sane

4
pkgs/python-packages/default.nix
View File

@@ -1,5 +1,5 @@
{ callPackage }: { callPackage, pkgs }:
{ {
feedsearch-crawler = callPackage ./feedsearch-crawler { }; feedsearch-crawler = callPackage ./feedsearch-crawler { };
sane-lib = (callPackage ../additional/sane-scripts { }).lib; sane-lib = pkgs.sane-scripts.lib;
} }