From b4e0b55e5608ae2b394880e69912d9352fea2d9d Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Fri, 1 May 2020 12:46:38 +0100
Subject: chore(build): Change pin for default nixpkgs used to build Nixery

This moves the pin from just being in the Travis configuration to also
being set in a nixpkgs-pin.nix file, which makes it trivial to build
at the right commit when performing local builds.
---
 tools/nixery/.travis.yml     | 2 +-
 tools/nixery/default.nix     | 2 +-
 tools/nixery/nixpkgs-pin.nix | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 tools/nixery/nixpkgs-pin.nix

(limited to 'tools')

diff --git a/tools/nixery/.travis.yml b/tools/nixery/.travis.yml
index b0a2b3f997..72bbb90b6a 100644
--- a/tools/nixery/.travis.yml
+++ b/tools/nixery/.travis.yml
@@ -5,7 +5,7 @@ arch:
 services:
   - docker
 env:
-  - NIX_PATH=nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/5271f8dddc0f2e54f55bd2fc1868c09ff72ac980.tar.gz
+  - NIX_PATH=nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/0a40a3999eb4d577418515da842a2622a64880c5.tar.gz
 before_script:
   - echo "Running Nixery CI build on $(uname -m)"
   - mkdir test-files
diff --git a/tools/nixery/default.nix b/tools/nixery/default.nix
index 7454c14a85..411865a8a4 100644
--- a/tools/nixery/default.nix
+++ b/tools/nixery/default.nix
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-{ pkgs ? import <nixpkgs> { }
+{ pkgs ? import ./nixpkgs-pin.nix
 , preLaunch ? ""
 , extraPackages ? []
 , maxLayers ? 20 }:
diff --git a/tools/nixery/nixpkgs-pin.nix b/tools/nixery/nixpkgs-pin.nix
new file mode 100644
index 0000000000..ea1b37bfe7
--- /dev/null
+++ b/tools/nixery/nixpkgs-pin.nix
@@ -0,0 +1,4 @@
+import (builtins.fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs-channels/archive/0a40a3999eb4d577418515da842a2622a64880c5.tar.gz";
+  sha256 = "1j8gy2d61lmrp5gzi1a2jmb2v2pbk4b9666y8pf1pjg3jiqkzf7m";
+}) {}
-- 
cgit 1.4.1