From 8e268c5ced755ac275f40501bb5061604869c98d Mon Sep 17 00:00:00 2001
From: Jonas Nick <jonasd.nick@gmail.com>
Date: Sun, 6 Dec 2020 21:42:20 +0000
Subject: [PATCH 1/3] Fetch from the nixpkgs repo instead of nixpkgs-channels

nixpkgs-channels is deprecated.
---
 helper/fetch-channel    | 2 +-
 pkgs/nixpkgs-pinned.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/helper/fetch-channel b/helper/fetch-channel
index 708e4ec..bdc64d1 100755
--- a/helper/fetch-channel
+++ b/helper/fetch-channel
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
 rev=$1
-sha256=$(nix-prefetch-url --unpack https://github.com/nixos/nixpkgs-channels/archive/$rev.tar.gz)
+sha256=$(nix-prefetch-url --unpack https://github.com/nixos/nixpkgs/archive/$rev.tar.gz)
 echo "rev = \"$rev\";"
 echo "sha256 = \"$sha256\";"
diff --git a/pkgs/nixpkgs-pinned.nix b/pkgs/nixpkgs-pinned.nix
index 67892a6..0d70c84 100644
--- a/pkgs/nixpkgs-pinned.nix
+++ b/pkgs/nixpkgs-pinned.nix
@@ -1,7 +1,7 @@
 let
   fetch = { rev, sha256 }:
     builtins.fetchTarball {
-      url = "https://github.com/nixos/nixpkgs-channels/archive/${rev}.tar.gz";
+      url = "https://github.com/nixos/nixpkgs/archive/${rev}.tar.gz";
       inherit sha256;
     };
 in

From 4318d0972de8d97767fabaf449f119c51c6549d3 Mon Sep 17 00:00:00 2001
From: Jonas Nick <jonasd.nick@gmail.com>
Date: Mon, 7 Dec 2020 12:27:30 +0000
Subject: [PATCH 2/3] Remove lightning-charge and nanopos from the
 unstable_pkgs CI test

They don't build with the nixpkgs-unstable update in the next commit and they're
deprecated anyway.
---
 ci/build.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ci/build.nix b/ci/build.nix
index 0d49619..16cb6a2 100644
--- a/ci/build.nix
+++ b/ci/build.nix
@@ -6,9 +6,7 @@ let
     elementsd
     hwi
     joinmarket
-    lightning-charge
     lightning-loop
-    nanopos
   ];
 in
 pkgs.writeText "ci-pkgs" (pkgs.lib.concatMapStringsSep "\n" toString ciPkgs)

From fabe4df478d7125155fab0d04620d9ade919a812 Mon Sep 17 00:00:00 2001
From: Jonas Nick <jonasd.nick@gmail.com>
Date: Sun, 6 Dec 2020 21:45:13 +0000
Subject: [PATCH 3/3] Update nixpkgs

Includes clightning: 0.9.1 -> 0.9.2 and btcpayserver: 1.0.5.5 -> 1.0.5.9
---
 pkgs/nixpkgs-pinned.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/nixpkgs-pinned.nix b/pkgs/nixpkgs-pinned.nix
index 0d70c84..00939dd 100644
--- a/pkgs/nixpkgs-pinned.nix
+++ b/pkgs/nixpkgs-pinned.nix
@@ -8,11 +8,11 @@ in
 {
   # To update, run ../helper/fetch-channel REV
   nixpkgs = fetch {
-    rev = "a9226f2b3a52fcbbc5587d2fa030729e714f40fe";
-    sha256 = "0xlzkymfrkj7z7b6hwliq2zn6pbjw08zka0qyv5bbnkhnv16x1dh";
+    rev = "e34208e10033315fddf6909d3ff68e2d3cf48a23";
+    sha256 = "0ngkx5ny7bschmiwc5q9yza8fdwlc3zg47avsywwp8yn96k2cpmg";
   };
   nixpkgs-unstable = fetch {
-    rev = "84d74ae9c9cbed73274b8e4e00be14688ffc93fe";
-    sha256 = "0ww70kl08rpcsxb9xdx8m48vz41dpss4hh3vvsmswll35l158x0v";
+    rev = "296793637b22bdb4d23b479879eba0a71c132a66";
+    sha256 = "0j09yih9693w5vjx64ikfxyja1ha7pisygrwrpg3wfz3sssglg69";
   };
 }