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) 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..00939dd 100644 --- a/pkgs/nixpkgs-pinned.nix +++ b/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"; }; }