From 8a49b41bb4b6d32bb6f05cfaac9004047d5fcbfe Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Sat, 14 Aug 2021 17:57:49 +0000 Subject: [PATCH] update nixpkgs-{stable,unstable} Includes - clightning 0.10.1 - lightning-loop 0.14.2 --- pkgs/clightning-plugins/default.nix | 4 +++- pkgs/nixpkgs-pinned.nix | 10 +++++----- pkgs/python-packages/pylightning/default.nix | 2 +- pkgs/python-packages/pyln-client/default.nix | 2 +- pkgs/python-packages/pyln-proto/default.nix | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/clightning-plugins/default.nix b/pkgs/clightning-plugins/default.nix index 50c8e0e..daec96c 100644 --- a/pkgs/clightning-plugins/default.nix +++ b/pkgs/clightning-plugins/default.nix @@ -17,7 +17,9 @@ let monitor = {}; prometheus = { extraPkgs = [ prometheus_client ]; - patchRequirements = "--replace prometheus-client==0.6.0 prometheus-client==0.9.0"; + patchRequirements = + "--replace prometheus-client==0.6.0 prometheus-client==0.9.0" + + " --replace pyln-client~=0.9.3 pyln-client~=0.10.1"; }; rebalance = {}; summary = { diff --git a/pkgs/nixpkgs-pinned.nix b/pkgs/nixpkgs-pinned.nix index 61c0130..0b57e7e 100644 --- a/pkgs/nixpkgs-pinned.nix +++ b/pkgs/nixpkgs-pinned.nix @@ -8,12 +8,12 @@ in { # To update, run ../helper/fetch-channel REV nixpkgs = fetch { - # nixos-21.05 (2021-08-03) - rev = "d4590d21006387dcb190c516724cb1e41c0f8fdf"; - sha256 = "17q39hlx1x87xf2rdygyimj8whdbx33nzszf4rxkc6b85wz0l38n"; + # nixos-21.05 (2021-08-14) + rev = "a445f5829889959d65ad65e5c961d5c67e1cd677"; + sha256 = "0zl930jjacdphplw1wv5nlhjk15zvflzzwp53zbh0l8qq01wh7bl"; }; nixpkgs-unstable = fetch { - rev = "16105403bdd843540cbef9c63fc0f16c1c6eaa70"; - sha256 = "0sl6hsxlh14kcs38jcra908nvi5hd8p8hlim3lbra55lz0kd9rcl"; + rev = "4138cbd913fad85073e59007710e3f083d0eb7c6"; + sha256 = "0l7vaa6mnnmxfxzi9i5gd4c4j3cpfh7gjsjsfk6nnj1r05pazf0j"; }; } diff --git a/pkgs/python-packages/pylightning/default.nix b/pkgs/python-packages/pylightning/default.nix index 5659dbf..2c4b59c 100644 --- a/pkgs/python-packages/pylightning/default.nix +++ b/pkgs/python-packages/pylightning/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pylightning"; - version = "0.9.3"; # defined in ${src}/contrib/pyln-client/pyln/client/__init__.py + version = "0.10.1"; # defined in ${src}/contrib/pyln-client/pyln/client/__init__.py inherit (clightning) src; diff --git a/pkgs/python-packages/pyln-client/default.nix b/pkgs/python-packages/pyln-client/default.nix index f306f11..a570691 100644 --- a/pkgs/python-packages/pyln-client/default.nix +++ b/pkgs/python-packages/pyln-client/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pyln-client"; - version = "0.9.3"; # defined in ${src}/contrib/pyln-client/pyln/client/__init__.py + version = "0.10.1"; # defined in ${src}/contrib/pyln-client/pyln/client/__init__.py inherit (clightning) src; diff --git a/pkgs/python-packages/pyln-proto/default.nix b/pkgs/python-packages/pyln-proto/default.nix index 2b35bdd..9a07143 100644 --- a/pkgs/python-packages/pyln-proto/default.nix +++ b/pkgs/python-packages/pyln-proto/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyln-proto"; - version = "0.9.3"; # defined in ${src}/contrib/pyln-proto/setup.py + version = "0.10.1"; # defined in ${src}/contrib/pyln-proto/setup.py inherit (clightning) src;