From b159fc36aa38bbe1ce3d87d96adffe161baf8662 Mon Sep 17 00:00:00 2001
From: Vincent Laporte
Date: Fri, 15 Mar 2019 13:30:34 +0000
Subject: [nix-ci] Share the reference to nixpkgs with default.nix

---
 dev/ci/nix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dev')

diff --git a/dev/ci/nix/default.nix b/dev/ci/nix/default.nix
index 94e0a666e2..992a246863 100644
--- a/dev/ci/nix/default.nix
+++ b/dev/ci/nix/default.nix
@@ -1,4 +1,4 @@
-{ pkgs ? import <nixpkgs> {}
+{ pkgs ? import ../../../nixpkgs.nix {}
 , branch
 , wd
 , project ? "xyz"
-- 
cgit v1.2.3


From 23f2c0405fe55d3c2f63e65880da906acf213254 Mon Sep 17 00:00:00 2001
From: Vincent Laporte
Date: Fri, 15 Mar 2019 13:37:28 +0000
Subject: [nix-ci] Use “master” versions of “coq-ext-lib” and “simple-io”

---
 dev/ci/nix/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'dev')

diff --git a/dev/ci/nix/default.nix b/dev/ci/nix/default.nix
index 992a246863..6dc0a71edc 100644
--- a/dev/ci/nix/default.nix
+++ b/dev/ci/nix/default.nix
@@ -20,8 +20,16 @@ let mathcomp = coqPackages.mathcomp.overrideAttrs (o: {
 let ssreflect = coqPackages.ssreflect.overrideAttrs (o: {
   inherit (mathcomp) src;
   }); in
-let coq-ext-lib = coqPackages.coq-ext-lib; in
-let simple-io = coqPackages.simple-io; in
+
+let coq-ext-lib = coqPackages.coq-ext-lib.overrideAttrs (o: {
+    src = fetchTarball "https://github.com/coq-ext-lib/coq-ext-lib/tarball/master";
+  }); in
+
+let simple-io = coqPackages.simple-io.overrideAttrs (o: {
+    src = fetchTarball "https://github.com/Lysxia/coq-simple-io/tarball/master";
+    buildInputs = o.buildInputs ++ [ coq-ext-lib ];
+  }); in
+
 let bignums = coqPackages.bignums.overrideAttrs (o:
     if bn == "release" then {} else
     if bn == "master" then { src = fetchTarball https://github.com/coq/bignums/archive/master.tar.gz; } else
-- 
cgit v1.2.3


From d7e7ec69c84db9c164dd546642ed0b638af766d3 Mon Sep 17 00:00:00 2001
From: Vincent Laporte
Date: Fri, 15 Mar 2019 17:43:15 +0000
Subject: [nix] Move nixpkgs.nix into the dev/ directory

---
 dev/ci/nix/default.nix | 2 +-
 dev/nixpkgs.nix        | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 dev/nixpkgs.nix

(limited to 'dev')

diff --git a/dev/ci/nix/default.nix b/dev/ci/nix/default.nix
index 6dc0a71edc..2dcacba0ea 100644
--- a/dev/ci/nix/default.nix
+++ b/dev/ci/nix/default.nix
@@ -1,4 +1,4 @@
-{ pkgs ? import ../../../nixpkgs.nix {}
+{ pkgs ? import ../../nixpkgs.nix {}
 , branch
 , wd
 , project ? "xyz"
diff --git a/dev/nixpkgs.nix b/dev/nixpkgs.nix
new file mode 100644
index 0000000000..13da772463
--- /dev/null
+++ b/dev/nixpkgs.nix
@@ -0,0 +1,4 @@
+import (fetchTarball {
+  url = "https://github.com/NixOS/nixpkgs/archive/11cf7d6e1ffd5fbc09a51b76d668ad0858a772ed.tar.gz";
+  sha256 = "0zcg4mgfdk3ryiqj1j5iv5bljjvsgi6q6j9z1vkq383c4g4clc72";
+})
-- 
cgit v1.2.3


From 0c3aa2f4bbd0bb5124ff3cc95759cb7cb89caa6b Mon Sep 17 00:00:00 2001
From: Vincent Laporte
Date: Mon, 18 Mar 2019 08:55:48 +0000
Subject: [nix] Update reference to nixpkgs

---
 dev/ci/nix/default.nix    | 5 +++--
 dev/ci/nix/quickchick.nix | 2 +-
 dev/nixpkgs.nix           | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'dev')

diff --git a/dev/ci/nix/default.nix b/dev/ci/nix/default.nix
index 2dcacba0ea..17070e66ee 100644
--- a/dev/ci/nix/default.nix
+++ b/dev/ci/nix/default.nix
@@ -25,9 +25,10 @@ let coq-ext-lib = coqPackages.coq-ext-lib.overrideAttrs (o: {
     src = fetchTarball "https://github.com/coq-ext-lib/coq-ext-lib/tarball/master";
   }); in
 
-let simple-io = coqPackages.simple-io.overrideAttrs (o: {
+let simple-io =
+  (coqPackages.simple-io.override { inherit coq-ext-lib; })
+  .overrideAttrs (o: {
     src = fetchTarball "https://github.com/Lysxia/coq-simple-io/tarball/master";
-    buildInputs = o.buildInputs ++ [ coq-ext-lib ];
   }); in
 
 let bignums = coqPackages.bignums.overrideAttrs (o:
diff --git a/dev/ci/nix/quickchick.nix b/dev/ci/nix/quickchick.nix
index 46bf02ae3c..b90f1e4f88 100644
--- a/dev/ci/nix/quickchick.nix
+++ b/dev/ci/nix/quickchick.nix
@@ -1,5 +1,5 @@
 { ocamlPackages, ssreflect, coq-ext-lib, simple-io }:
 {
   buildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild num ];
-  coqBuildInputs = [ ssreflect coq-ext-lib simple-io ];
+  coqBuildInputs = [ ssreflect simple-io ];
 }
diff --git a/dev/nixpkgs.nix b/dev/nixpkgs.nix
index 13da772463..4aa0f04964 100644
--- a/dev/nixpkgs.nix
+++ b/dev/nixpkgs.nix
@@ -1,4 +1,4 @@
 import (fetchTarball {
-  url = "https://github.com/NixOS/nixpkgs/archive/11cf7d6e1ffd5fbc09a51b76d668ad0858a772ed.tar.gz";
-  sha256 = "0zcg4mgfdk3ryiqj1j5iv5bljjvsgi6q6j9z1vkq383c4g4clc72";
+  url = "https://github.com/NixOS/nixpkgs/archive/2923bd5d0669f1ec6ab03ddce052e9c5efb46d8f.tar.gz";
+  sha256 = "16cn93rpxfql5idhigyjyhc013a3hwzyy2dl1xv7h2p78sk728vw";
 })
-- 
cgit v1.2.3