diff options
| author | Vincent Laporte | 2019-03-15 17:43:15 +0000 |
|---|---|---|
| committer | Vincent Laporte | 2019-03-18 08:56:11 +0000 |
| commit | d7e7ec69c84db9c164dd546642ed0b638af766d3 (patch) | |
| tree | 628a8ce13320cb98853f15c714e5919ab5bab2d3 | |
| parent | 23f2c0405fe55d3c2f63e65880da906acf213254 (diff) | |
[nix] Move nixpkgs.nix into the dev/ directory
| -rw-r--r-- | default.nix | 2 | ||||
| -rw-r--r-- | dev/ci/nix/default.nix | 2 | ||||
| -rw-r--r-- | dev/nixpkgs.nix (renamed from nixpkgs.nix) | 0 |
3 files changed, 2 insertions, 2 deletions
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/nixpkgs.nix b/dev/nixpkgs.nix index 13da772463..13da772463 100644 --- a/nixpkgs.nix +++ b/dev/nixpkgs.nix |