mirror of
https://github.com/milahu/nur-packages.git
synced 2024-10-05 23:27:32 +03:00
Compare commits
3 Commits
6911dcf8be
...
85d5c16dfe
Author | SHA1 | Date | |
---|---|---|---|
|
85d5c16dfe | ||
|
db0e4601ff | ||
|
fe81fe565b |
20
default.nix
20
default.nix
@ -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 {}) // (
|
||||
|
@ -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
|
||||
'';
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user