Skip to content

Commit

Permalink
nix: properly override python3 package set
Browse files Browse the repository at this point in the history
  • Loading branch information
vlaci committed Dec 11, 2023
1 parent 74e3d69 commit 12738e2
Showing 1 changed file with 16 additions and 17 deletions.
33 changes: 16 additions & 17 deletions overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ inputs: final: prev:
version = "1.47.0-3.ok1";
src = prev.fetchurl {
url = "https://github.com/onekey-sec/e2fsprogs/archive/refs/tags/v1.47.0-3.ok1.tar.gz";
hash = "sha256-fsLUySjAdgnRp5m405a4Egso+LXNLxR9Y7WHt8qAvFM=";
hash = "sha256-y3eq2gbgfGhSGe1uS+QAI2YjK8QiOgv7iYC+8RAe1FM=";
};
});

Expand Down Expand Up @@ -79,27 +79,26 @@ inputs: final: prev:

});

python3 = prev.python3 // {
pkgs = prev.python3.pkgs.overrideScope
(pyFinal: pyPrev: {
# Own package updated independently of nixpkgs
lzallright = pyFinal.callPackage ./nix/lzallright { };
python3 = prev.python3.override {
packageOverrides = pyFinal: pyPrev: {
# Own package updated independently of nixpkgs
lzallright = pyFinal.callPackage ./nix/lzallright { };

# Own package updated independently of nixpkgs
pyperscan = inputs.pyperscan.packages.${final.system}.default.vectorscan;
# Own package updated independently of nixpkgs
pyperscan = inputs.pyperscan.packages.${final.system}.default.vectorscan;

# Missing from nixpkgs
treelib = pyFinal.callPackage ./nix/treelib { };
# Missing from nixpkgs
treelib = pyFinal.callPackage ./nix/treelib { };

# Missing from nixpkgs
pyfatfs = pyFinal.callPackage ./nix/pyfatfs { };
# Missing from nixpkgs
pyfatfs = pyFinal.callPackage ./nix/pyfatfs { };

# The reason for everything
unblob = pyFinal.callPackage ./nix/unblob { };
# The reason for everything
unblob = pyFinal.callPackage ./nix/unblob { };

# Own package updated independently of nixpkgs
unblob-native = inputs.unblob-native.packages.${final.system}.default;
});
# Own package updated independently of nixpkgs
unblob-native = inputs.unblob-native.packages.${final.system}.default;
};
};

# Existing alias is rebound to the updated package set for consistence
Expand Down

0 comments on commit 12738e2

Please sign in to comment.