diff --git a/pkgs/python-packages/default.nix b/pkgs/python-packages/default.nix index bb5cfdd..4d6d568 100644 --- a/pkgs/python-packages/default.nix +++ b/pkgs/python-packages/default.nix @@ -11,14 +11,6 @@ in { urldecode = callPackage ./urldecode {}; chromalog = callPackage ./chromalog {}; txzmq = callPackage ./txzmq {}; - recommonmark = callPackage ./recommonmark { inherit (super) recommonmark; }; - - # cryptography 3.3.2, required by joinmarketdaemon - cryptography = callPackage ./cryptography {}; - cryptography_vectors = callPackage ./cryptography/vectors.nix {}; - - # twisted 20.3.0, required by joinmarketbase - twisted = callPackage ./twisted {}; joinmarketbase = joinmarketPkg ./jmbase; joinmarketclient = joinmarketPkg ./jmclient; @@ -28,4 +20,16 @@ in { pyln-client = clightningPkg ./pyln-client; pyln-proto = clightningPkg ./pyln-proto; pylightning = clightningPkg ./pylightning; + + ## Specific versions of packages that already exist in nixpkgs + + # cryptography 3.3.2, required by joinmarketdaemon + cryptography = callPackage ./specific-versions/cryptography {}; + cryptography_vectors = callPackage ./specific-versions/cryptography/vectors.nix {}; + + # twisted 20.3.0, required by joinmarketbase + twisted = callPackage ./specific-versions/twisted.nix {}; + + # recommonmark 0.7.1, required by pyln-client + recommonmark = callPackage ./specific-versions/recommonmark.nix { inherit (super) recommonmark; }; } diff --git a/pkgs/python-packages/cryptography/default.nix b/pkgs/python-packages/specific-versions/cryptography/default.nix similarity index 100% rename from pkgs/python-packages/cryptography/default.nix rename to pkgs/python-packages/specific-versions/cryptography/default.nix diff --git a/pkgs/python-packages/cryptography/vectors.nix b/pkgs/python-packages/specific-versions/cryptography/vectors.nix similarity index 100% rename from pkgs/python-packages/cryptography/vectors.nix rename to pkgs/python-packages/specific-versions/cryptography/vectors.nix diff --git a/pkgs/python-packages/recommonmark/default.nix b/pkgs/python-packages/specific-versions/recommonmark.nix similarity index 100% rename from pkgs/python-packages/recommonmark/default.nix rename to pkgs/python-packages/specific-versions/recommonmark.nix diff --git a/pkgs/python-packages/twisted/default.nix b/pkgs/python-packages/specific-versions/twisted.nix similarity index 100% rename from pkgs/python-packages/twisted/default.nix rename to pkgs/python-packages/specific-versions/twisted.nix