Merge #279: Update nixpkgs

fabe4df478 Update nixpkgs (Jonas Nick)
4318d0972d Remove lightning-charge and nanopos from the unstable_pkgs CI test (Jonas Nick)
8e268c5ced Fetch from the nixpkgs repo instead of nixpkgs-channels (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK fabe4df478

Tree-SHA512: b8445b9aff0fb57efb17cb162b6a07419063bfd6b3b2f71752d126a44d3a6dee6e8ccbc318c2b57d079e8915f525de7dffd7c0856fc78e864bb108bf4be9576f

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)

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\";"

pkgs/nixpkgs-pinned.nix

@@ -1,18 +1,18 @@
 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
 {
   # 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";
   };
 }