move python packages to pkgs/python-packages

Remove obsolete passthru from joinmarket because joinmarket packages are
now accessible via pkgs/python-packages.

pkgs/default.nix

@@ -8,13 +8,17 @@ let self = {
   hwi = pkgs.callPackage ./hwi { };
   pylightning = pkgs.python3Packages.callPackage ./pylightning { };
   liquid-swap = pkgs.python3Packages.callPackage ./liquid-swap { };
-  joinmarket = pkgs.callPackage ./joinmarket { };
+  joinmarket = pkgs.callPackage ./joinmarket { inherit (self) nbPython3Packages; };
   generate-secrets = pkgs.callPackage ./generate-secrets { };
   nixops19_09 = pkgs.callPackage ./nixops { };
   netns-exec = pkgs.callPackage ./netns-exec { };
   lightning-loop = pkgs.callPackage ./lightning-loop { };
   extra-container = pkgs.callPackage ./extra-container { };
 
+  nbPython3Packages = (pkgs.python3.override {
+    packageOverrides = pySelf: super: import ./python-packages self pySelf;
+  }).pkgs;
+
   pinned = import ./pinned.nix;
 
   lib = import ./lib.nix { inherit (pkgs) lib; };

pkgs/joinmarket/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python3, pkgs }:
+{ stdenv, lib, fetchurl, python3, nbPython3Packages, pkgs }:
 
 let
   version = "0.7.2";
@@ -7,32 +7,14 @@ let
     sha256 = "03gvs20d2cfzy9x82l6v4c69w0j9mr4p9zj2hpymnb6xs1yq6dr1";
   };
 
-  python = python3.override {
+  runtimePackages = with nbPython3Packages; [
-    packageOverrides = self: super: let
-      joinmarketPkg = pkg: self.callPackage pkg { inherit version src; };
-    in {
-      joinmarketbase = joinmarketPkg ./jmbase;
-      joinmarketclient = joinmarketPkg ./jmclient;
-      joinmarketbitcoin = joinmarketPkg ./jmbitcoin;
-      joinmarketdaemon = joinmarketPkg ./jmdaemon;
-
-      chromalog = self.callPackage ./chromalog {};
-      bencoderpyx = self.callPackage ./bencoderpyx {};
-      coincurve = self.callPackage ./coincurve {};
-      urldecode = self.callPackage ./urldecode {};
-      python-bitcointx = self.callPackage ./python-bitcointx {};
-      secp256k1 = self.callPackage ./secp256k1 {};
-    };
-  };
-
-  runtimePackages = with python.pkgs; [
     joinmarketbase
     joinmarketclient
     joinmarketbitcoin
     joinmarketdaemon
   ];
 
-  pythonEnv = python.withPackages (_: runtimePackages);
+  pythonEnv = python3.withPackages (_: runtimePackages);
 in
 stdenv.mkDerivation {
   pname = "joinmarket";
@@ -62,8 +44,4 @@ stdenv.mkDerivation {
     chmod +x -R $out/bin
     patchShebangs $out/bin
   '';
-
-  passthru = {
-      inherit python runtimePackages pythonEnv;
-  };
 }

pkgs/python-packages/default.nix

@@ -0,0 +1,19 @@
+nbPkgs:
+self:
+let
+  inherit (self) callPackage;
+
+  joinmarketPkg = pkg: callPackage pkg { inherit (nbPkgs.joinmarket) version src; };
+in {
+  bencoderpyx = callPackage ./bencoderpyx {};
+  coincurve = callPackage ./coincurve {};
+  python-bitcointx = callPackage ./python-bitcointx {};
+  secp256k1 = callPackage ./secp256k1 {};
+  urldecode = callPackage ./urldecode {};
+  chromalog = callPackage ./chromalog {};
+
+  joinmarketbase = joinmarketPkg ./jmbase;
+  joinmarketclient = joinmarketPkg ./jmclient;
+  joinmarketbitcoin = joinmarketPkg ./jmbitcoin;
+  joinmarketdaemon = joinmarketPkg ./jmdaemon;
+}