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

---
 default.nix            | 2 +-
 dev/ci/nix/default.nix | 2 +-
 dev/nixpkgs.nix        | 4 ++++
 nixpkgs.nix            | 4 ----
 4 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 dev/nixpkgs.nix
 delete mode 100644 nixpkgs.nix

diff --git a/default.nix b/default.nix
index d48b2012d2..cede0cd6b1 100644
--- a/default.nix
+++ b/default.nix
@@ -21,7 +21,7 @@
 # Once the build is finished, you will find, in the current directory,
 # a symlink to where Coq was installed.
 
-{ pkgs ? import ./nixpkgs.nix {}
+{ pkgs ? import ./dev/nixpkgs.nix {}
 , ocamlPackages ? pkgs.ocamlPackages
 , buildIde ? true
 , buildDoc ? true
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";
+})
diff --git a/nixpkgs.nix b/nixpkgs.nix
deleted file mode 100644
index 13da772463..0000000000
--- a/nixpkgs.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import (fetchTarball {
-  url = "https://github.com/NixOS/nixpkgs/archive/11cf7d6e1ffd5fbc09a51b76d668ad0858a772ed.tar.gz";
-  sha256 = "0zcg4mgfdk3ryiqj1j5iv5bljjvsgi6q6j9z1vkq383c4g4clc72";
-})
-- 
cgit v1.2.3