aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2024-07-17 14:11:36 +0200
committerKarel Kočí <cynerd@email.cz>2024-07-17 14:11:36 +0200
commit632f8c5cc19be6d7ccd975f825d534627d0cbeff (patch)
tree5681c2fe3879ec7acd387377de2877f58987422b
parentdc771c290c882b4229cd0c2793c6faaca125b2a1 (diff)
downloadnixos-personal-632f8c5cc19be6d7ccd975f825d534627d0cbeff.tar.gz
nixos-personal-632f8c5cc19be6d7ccd975f825d534627d0cbeff.tar.bz2
nixos-personal-632f8c5cc19be6d7ccd975f825d534627d0cbeff.zip
pkgs: fix bcg with Python 3.12
-rw-r--r--flake.lock18
-rw-r--r--pkgs/default.nix22
2 files changed, 31 insertions, 9 deletions
diff --git a/flake.lock b/flake.lock
index 68c966e..ca7671e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -274,11 +274,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1720515935,
- "narHash": "sha256-8b+fzR4W2hI5axwB+4nBwoA15awPKkck4ghhCt8v39M=",
+ "lastModified": 1720737798,
+ "narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "a111ce6b537df12a39874aa9672caa87f8677eda",
+ "rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751",
"type": "github"
},
"original": {
@@ -332,11 +332,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1720585496,
- "narHash": "sha256-UONPcQR2r0voopd6pcNFmUv7p4TJPeAXzwnqWmaPujw=",
+ "lastModified": 1721171313,
+ "narHash": "sha256-MtMXEzF7X57E71SIU2vqhOpzu58D4qypptXObVBd+Vs=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "e01511309fe8b0432aa58a547365e51d5a3ecf85",
+ "rev": "034f3eec9b56e2fa22ee77f67403310c202ed398",
"type": "github"
},
"original": {
@@ -693,11 +693,11 @@
},
"vpsadminos": {
"locked": {
- "lastModified": 1720004960,
- "narHash": "sha256-3side3GccLz9lIhZFnQRrkkLdAoPfs01aNvkHL9ex5s=",
+ "lastModified": 1721139097,
+ "narHash": "sha256-+Wz+FhEyJPq/log2NY1evzH0auDPjkgCo+4ZDbugGcs=",
"owner": "vpsfreecz",
"repo": "vpsadminos",
- "rev": "4e9159b4357e45a065834c30ad94b39d21233ba2",
+ "rev": "b4b62f26eb4703e9816ca273d0fd5f98893aeb90",
"type": "github"
},
"original": {
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 7094b78..ad2236d 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -39,6 +39,28 @@ in {
nodejs-slim_20 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v20.nix") {enableNpm = false;};
nodejs_22 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v22.nix") {};
nodejs-slim_22 = callPackageNodejs (prev.path + "/pkgs/development/web/nodejs/v22.nix") {enableNpm = false;};
+ pythonPackagesExtensions =
+ prev.pythonPackagesExtensions
+ ++ [
+ (
+ pyfinal: pyprev: {
+ bcg = pyprev.bcg.overrideAttrs {
+ patches =
+ pyprev.bcg.patches
+ ++ [
+ (final.fetchpatch2 {
+ name = "bcg-fix-import-with-Python-3.12.patch";
+ url = "https://github.com/cynerd/bch-gateway/commit/1314c892992d8914802b6c42602c39f6a1418fca.patch";
+ hash = "sha256-+vmkqnnkf81umjesTIFgh0mMh2fCCn/yFyQl6ENP9Cc=";
+ })
+ ];
+ propagatedBuildInputs =
+ pyprev.bcg.propagatedBuildInputs
+ ++ [pyfinal.looseversion];
+ };
+ }
+ )
+ ];
# Older version of packages
flac1_3 = prev.flac.overrideAttrs {