From 2a4d0627e61ce9261d891b5199c2463c5b62ee4f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 15 Mar 2019 13:00:17 +0000 Subject: [nix] Store the reference to nixpkgs in a dedicated file --- default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'default.nix') diff --git a/default.nix b/default.nix index 3290f5dee8..d48b2012d2 100644 --- a/default.nix +++ b/default.nix @@ -21,11 +21,7 @@ # Once the build is finished, you will find, in the current directory, # a symlink to where Coq was installed. -{ pkgs ? - (import (fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/11cf7d6e1ffd5fbc09a51b76d668ad0858a772ed.tar.gz"; - sha256 = "0zcg4mgfdk3ryiqj1j5iv5bljjvsgi6q6j9z1vkq383c4g4clc72"; - }) {}) +{ pkgs ? import ./nixpkgs.nix {} , ocamlPackages ? pkgs.ocamlPackages , buildIde ? true , buildDoc ? true -- 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 --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'default.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 -- cgit v1.2.3