Merge #350: Update nixos unstable

daeedda825 clightning-plugins: update rev and dependencies (nixbitcoin)
c5f67629e6 joinmarket: add copy of cryptography 3.3.2 (Erik Arvstedt)
ca0c6289d7 update nixpkgs-unstable (nixbitcoin)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK daeedda825

Tree-SHA512: 5fc79e50b68fa4c584a2e861a5bf07298595ac6f2eb0e6e9d9351440e51dca4d33a6c09e417e624791153f160cdbeba014ef0ee6b9d6ea28f0b46f64a9c46396

pkgs/clightning-plugins/default.nix

@@ -6,8 +6,8 @@ let
   src = pkgs.fetchFromGitHub {
     owner = "lightningd";
     repo = "plugins";
-    rev = "6cd472636926f05a9c472139fabe1ff11c90aa6a";
+    rev = "6f2b8fb6374600f9e1e06e57884bde99d85383bf";
-    sha256 = "1lisx85vzsfzjhdc6zdz0l6bcrdgg6rp5xbc5jmx93mv8qqg2cns";
+    sha256 = "0hibkwdljpja9974zwbcpvpdhb4c96vda57qfj7cbinvfswj5bi0";
   };
 
   version = builtins.substring 0 7 src.rev;

pkgs/default.nix

@@ -18,7 +18,7 @@ let self = {
   secp256k1 = pkgs.callPackage ./secp256k1 { };
 
   nbPython3Packages = (pkgs.python3.override {
-    packageOverrides = pySelf: super: import ./python-packages self pySelf;
+    packageOverrides = import ./python-packages self;
   }).pkgs;
 
   pinned = import ./pinned.nix;

pkgs/nixpkgs-pinned.nix

@@ -12,7 +12,7 @@ in
     sha256 = "0aj4xfkwk8gf96ypjp0rcap3hxrqg5qdwgwgx55zk0mlvq9z3h68";
   };
   nixpkgs-unstable = fetch {
-    rev = "c7d0dbe094c988209edac801eb2a0cc21aa498d8";
+    rev = "3d1a7716d7f1fccbd7d30ab3b2ed3db831f43bde";
-    sha256 = "1rwjfjwwaic56n778fvrmv1s1vzw565gqywrpqv72zrrzmavhyrx";
+    sha256 = "14r8qa6lnzp78c3amzi5r8n11l1kcxcx1gjhnc1kmn4indd43649";
   };
 }

pkgs/python-packages/cryptography/default.nix

@@ -0,0 +1,83 @@
+# Copied from nixpkgs rev c7d0dbe094c988209edac801eb2a0cc21aa498d8
+
+{ lib, stdenv
+, buildPythonPackage
+, fetchPypi
+, fetchpatch
+, isPy27
+, ipaddress
+, openssl
+, cryptography_vectors
+, darwin
+, packaging
+, six
+, pythonOlder
+, isPyPy
+, cffi
+, pytest
+, pretend
+, iso8601
+, pytz
+, hypothesis
+, enum34
+}:
+
+buildPythonPackage rec {
+  pname = "cryptography";
+  version = "3.3.2"; # Also update the hash in vectors.nix
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1vcvw4lkw1spiq322pm1256kail8nck6bbgpdxx3pqa905wd6q2s";
+  };
+
+  outputs = [ "out" "dev" ];
+
+  nativeBuildInputs = lib.optionals (!isPyPy) [
+    cffi
+  ];
+
+  buildInputs = [ openssl ]
+             ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
+  propagatedBuildInputs = [
+    packaging
+    six
+  ] ++ lib.optionals (!isPyPy) [
+    cffi
+  ] ++ lib.optionals isPy27 [
+    ipaddress enum34
+  ];
+
+  checkInputs = [
+    cryptography_vectors
+    hypothesis
+    iso8601
+    pretend
+    pytest
+    pytz
+  ];
+
+  checkPhase = ''
+    py.test --disable-pytest-warnings tests
+  '';
+
+  # IOKit's dependencies are inconsistent between OSX versions, so this is the best we
+  # can do until nix 1.11's release
+  __impureHostDeps = [ "/usr/lib" ];
+
+  meta = with lib; {
+    description = "A package which provides cryptographic recipes and primitives";
+    longDescription = ''
+      Cryptography includes both high level recipes and low level interfaces to
+      common cryptographic algorithms such as symmetric ciphers, message
+      digests, and key derivation functions.
+      Our goal is for it to be your "cryptographic standard library". It
+      supports Python 2.7, Python 3.5+, and PyPy 5.4+.
+    '';
+    homepage = "https://github.com/pyca/cryptography";
+    changelog = "https://cryptography.io/en/latest/changelog/#v"
+      + replaceStrings [ "." ] [ "-" ] version;
+    license = with licenses; [ asl20 bsd3 psfl ];
+    maintainers = with maintainers; [ primeos ];
+  };
+}

pkgs/python-packages/cryptography/vectors.nix

@@ -0,0 +1,25 @@
+# Copied from nixpkgs rev c7d0dbe094c988209edac801eb2a0cc21aa498d8
+
+{ buildPythonPackage, fetchPypi, lib, cryptography }:
+
+buildPythonPackage rec {
+  pname = "cryptography_vectors";
+  # The test vectors must have the same version as the cryptography package:
+  version = cryptography.version;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1yhaps0f3h2yjb6lmz953z1l1d84y9swk4k3gj9nqyk4vbx5m7cc";
+  };
+
+  # No tests included
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Test vectors for the cryptography package";
+    homepage = "https://cryptography.io/en/latest/development/test-vectors/";
+    # Source: https://github.com/pyca/cryptography/tree/master/vectors;
+    license = with licenses; [ asl20 bsd3 ];
+    maintainers = with maintainers; [ primeos ];
+  };
+}

pkgs/python-packages/default.nix

@@ -1,5 +1,4 @@
-nbPkgs:
+nbPkgs: self: super:
-self:
 let
   inherit (self) callPackage;
 
@@ -14,10 +13,11 @@ 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 "${unstable}/pkgs/development/python-modules/cryptography" {};
+  cryptography = callPackage ./cryptography {};
-  cryptography_vectors = callPackage "${unstable}/pkgs/development/python-modules/cryptography/vectors.nix" {};
+  cryptography_vectors = callPackage ./cryptography/vectors.nix {};
 
   joinmarketbase = joinmarketPkg ./jmbase;
   joinmarketclient = joinmarketPkg ./jmclient;

pkgs/python-packages/pylightning/default.nix

@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "pylightning";
-  version = "0.8.0"; # defined in ${src}/contrib/pyln-client/pyln/client/__init__.py
+  version = "0.9.3"; # defined in ${src}/contrib/pyln-client/pyln/client/__init__.py
 
   inherit (clightning) src;
 
@@ -10,8 +10,4 @@ buildPythonPackage rec {
 
   postUnpack = "sourceRoot=$sourceRoot/contrib/${pname}";
 
-  # The clightning source contains pyln-client 0.8.0
-  postPatch = ''
-    substituteInPlace requirements.txt --replace pyln-client==0.7.3 pyln-client==0.8.0
-  '';
 }

pkgs/python-packages/pyln-client/default.nix

@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "pyln-client";
-  version = "0.8.0"; # defined in ${src}/contrib/pyln-client/pyln/client/__init__.py
+  version = "0.9.3"; # defined in ${src}/contrib/pyln-client/pyln/client/__init__.py
 
   inherit (clightning) src;
 

pkgs/python-packages/pyln-proto/default.nix

@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "pyln-proto";
-  version = "0.8.4"; # defined in ${src}/contrib/pyln-proto/setup.py
+  version = "0.9.3"; # defined in ${src}/contrib/pyln-proto/setup.py
 
   inherit (clightning) src;
 
@@ -22,10 +22,4 @@ buildPythonPackage rec {
 
   postUnpack = "sourceRoot=$sourceRoot/contrib/${pname}";
 
-  postPatch = ''
-    substituteInPlace requirements.txt \
-      --replace base58==1.0.2 base58==2.0.1 \
-      --replace bitstring==3.1.6 bitstring==3.1.5 \
-      --replace cryptography==2.8 cryptography==3.1
-  '';
 }

pkgs/python-packages/recommonmark/default.nix

@@ -0,0 +1,12 @@
+{ recommonmark, fetchFromGitHub }:
+
+recommonmark.overridePythonAttrs (old: rec {
+  version = "0.7.1";
+
+  src = fetchFromGitHub {
+    owner = "rtfd";
+    repo = old.pname;
+    rev = version;
+    sha256 = "0kwm4smxbgq0c0ybkxfvlgrfb3gq9amdw94141jyykk9mmz38379";
+  };
+})