milahu/nur-packages
1
1
Fork 0
mirror of https://github.com/milahu/nur-packages.git synced 2024-10-05 23:27:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: milahu:6911dcf8bec040d75368431e7854c530f01a0777
Branches Tags
milahu:master
...
compare: milahu:85d5c16dfe0b4826685a56aa5b1be329f150577e
Branches Tags
milahu:master

3 Commits
6911dcf8be ... 85d5c16dfe

Author SHA1 Message Date
Milan Hauth
85d5c16dfe python3: fix: error: attribute 'sitePackages' missing: python3.sitePackages 2023-08-03 16:18:02 +02:00
Milan Hauth
db0e4601ff mediawiki-scraper: fix: error: attribute 'sitePackages' missing: python3.sitePackages 2023-08-03 16:12:44 +02:00
Milan Hauth
fe81fe565b python3: add recurseIntoAttrs 2023-08-03 16:01:36 +02:00
2 changed files with 18 additions and 5 deletions
Show Stats Expand all files Collapse all files

20
default.nix
View File

@ -101,13 +101,24 @@ pkgs.lib.makeScope pkgs.newScope (self: let inherit (self) callPackage; in rec {
libalf = callPackage ./pkgs/libalf/libalf.nix { };
python3 = pkgs.python3 // {
#python3 = pkgs.recurseIntoAttrs (((pkgs.python3 // {
#python3 = pkgs.recurseIntoAttrs (lib.makeScope pkgs.newScope ((pkgs.python3 // {
#python3 = pkgs.recurseIntoAttrs (lib.makeScope pkgs.python3.newScope ((pkgs.python3 // {
#python3 = pkgs.recurseIntoAttrs (lib.makeScope pkgs.python3.newScope (self: with self; ({
python3 = pkgs.recurseIntoAttrs (lib.makeScope pkgs.python3.newScope (self: with self; (pkgs.python3 // {
# fix: error: attribute 'sitePackages' missing: python3.sitePackages
sitePackages = "lib/python${pkgs.python3.pythonVersion}/site-packages";
# FIXME scope with new callPackage
#pkgs = (pkgs.python3.pkgs or {}) // ({
# error: attribute 'buildPythonApplication' missing: python3.pkgs.buildPythonApplication
#pkgs = (pkgs.python3.pkgs or {}) // lib.makeScope pkgs.newScope (self: with self; {
# https://github.com/NixOS/nixpkgs/commit/632c4f2c9ba1f88cd5662da7bedf2ca5f0cda4a9 # add scope
pkgs = lib.makeScope pkgs.newScope (self: with self; (pkgs.python3.pkgs or {}) // {
#pkgs = (lib.makeScope pkgs.newScope (self: with self; (pkgs.python3.pkgs or {}) // {
#pkgs = (lib.makeScope pkgs.python3.pkgs.newScope (self: with self; (pkgs.python3.pkgs or {}) // {
#pkgs = pkgs.recurseIntoAttrs (lib.makeScope pkgs.newScope (self: with self; (pkgs.python3.pkgs or {}) // {
pkgs = pkgs.recurseIntoAttrs (lib.makeScope pkgs.python3.pkgs.newScope (self: with self; (pkgs.python3.pkgs // {
# fix recursion
python3.pkgs = self;
@ -200,8 +211,9 @@ pkgs.lib.makeScope pkgs.newScope (self: let inherit (self) callPackage; in rec {
# python3.pkgs.pyload
pyload = python3.pkgs.callPackage ./pkgs/python3/pkgs/pyload/pyload.nix { };
});
};
}))); # python3.pkgs
}))); # python3
deno = pkgs.deno // {
pkgs = (pkgs.deno.pkgs or {}) // (

3
pkgs/tools/networking/mediawiki-scraper/mediawiki-scraper.nix
View File

@ -10,6 +10,7 @@
, file-read-backwards
, pymysql
, python3
, pkgs
# FIXME move to pkgs/python3/pkgs
@ -156,7 +157,7 @@ python3Packages.buildPythonApplication rec {
# fix import path
cd $out/bin
for f in .*-wrapped; do
substituteInPlace "$f" --replace "], site._init_pathinfo());" ",'$out/${python3.sitePackages}/wikiteam3'], site._init_pathinfo());"
substituteInPlace "$f" --replace "], site._init_pathinfo());" ",'$out/${pkgs.python3.sitePackages}/wikiteam3'], site._init_pathinfo());"
done
'';