erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

overlay: Remove Python override

Browse source
This commit is contained in:
Erwin Boskma 2024-08-05 14:28:16 +02:00
parent 63e44559c1
commit df150b7094
Signed by: erwin
SSH key fingerprint: SHA256:/Wk1WZdLg+vQHs3in9qq7PsIp8SMzwGSk/RLZ5zPuZk
1 changed files with 1 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
overlays/default.nix
View file

@ -1,4 +1,4 @@
final: prev: {
_final: prev: {
backscrub = prev.pkgs.callPackage ../pkgs/backscrub {
inherit (prev.pkgs)
gcc
@ -20,37 +20,4 @@ final: prev: {
git-repo-go = prev.pkgs.callPackage ../pkgs/git-repo-go { };
# Temporary until nixos-unstable is fixed for Python 3.12
python312 = prev.python312.override {
packageOverrides = _finalPkgs: prevPkgs: {
nose = prevPkgs.nose.overrideAttrs {
patches = [
(final.fetchpatch2 {
url = "https://github.com/NixOS/nixpkgs/raw/599e471d78801f95ccd2c424a37e76ce177e50b9/pkgs/development/python-modules/nose/0001-nose-python-3.12-fixes.patch";
hash = "sha256-aePOvO5+TJL4JzXywc7rEiYRzfdObSI9fg9Cfrp+e2o=";
})
];
};
wxpython = prevPkgs.wxpython.overrideAttrs {
disabled = false;
postPatch =
let
waf_2_0_25 = prev.fetchurl {
url = "https://waf.io/waf-2.0.25";
hash = "sha256-IRmc0iDM9gQ0Ez4f0quMjlIXw3mRmcgnIlQ5cNyOONU=";
};
in
''
cp ${waf_2_0_25} bin/waf-2.0.25
chmod +x bin/waf-2.0.25
substituteInPlace build.py \
--replace-fail "wafCurrentVersion = '2.0.24'" "wafCurrentVersion = '2.0.25'" \
--replace-fail "wafMD5 = '698f382cca34a08323670f34830325c4'" "wafMD5 = 'a4b1c34a03d594e5744f9e42f80d969d'" \
--replace-fail "distutils.dep_util" "setuptools.modified"
'';
};
python-hglib = prevPkgs.python-hglib.overrideAttrs { dontUseSetuptoolsCheck = "1"; };
};
};
python312Packages = final.python312.pkgs;
}