From 4c4cc2e386ad9827ebfdf8b6646229519ce0e3cf Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 18 Oct 2019 14:23:28 -0400
Subject: [PATCH] Achieve nixpkgs pinning in a different way
---
README.rst | 4 ++++
nixpkgs.nix | 9 ---------
nixpkgs.rev | 1 +
3 files changed, 5 insertions(+), 9 deletions(-)
delete mode 100644 nixpkgs.nix
create mode 100644 nixpkgs.rev
diff --git a/README.rst b/README.rst
index 675c9a7f..689f5b67 100644
--- a/README.rst
+++ b/README.rst
@@ -7,6 +7,10 @@ Building
--------
The build system uses `Nix`_ which must be installed before anything can be built.
+Builds are tested against a particular nixpkgs revision.
+Start by exporting ``NIX_PATH`` to ensure you use the same revision::
+
+ $ export NIX_PATH=nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/$(cat nixpkgs.rev).tar.gz
Documentation
~~~~~~~~~~~~~
diff --git a/nixpkgs.nix b/nixpkgs.nix
deleted file mode 100644
index ff369425..00000000
--- a/nixpkgs.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-# Pin the deployment package-set to a specific version of nixpkgs. This is
-# NixOS 19.09 as of Oct 2 2019. There's nothing special about it. It's just
-# recent at the time of development. It can be upgraded when there is value
-# in doing so. Meanwhile, our platform doesn't shift around beneath us in
-# surprising ways as time passes.
-import (builtins.fetchTarball {
- url = "https://github.com/NixOS/nixpkgs-channels/archive/5d5cd70516001e79516d2ade8bcf31df208a4ef3.tar.gz";
- sha256 = "042i081cfwdvcfp3q79219akypb53chf730wg0vwxlp21pzgns33";
-})
diff --git a/nixpkgs.rev b/nixpkgs.rev
new file mode 100644
index 00000000..fff71dca
--- /dev/null
+++ b/nixpkgs.rev
@@ -0,0 +1 @@
+8bf142e001b6876b021c8ee90c2c7cec385fe8e9
--
GitLab