diff options
| author | Vincent Laporte | 2019-03-18 08:55:48 +0000 |
|---|---|---|
| committer | Vincent Laporte | 2019-03-18 08:56:11 +0000 |
| commit | 0c3aa2f4bbd0bb5124ff3cc95759cb7cb89caa6b (patch) | |
| tree | 21f3242cb3dabf35ce446398988f11013286f8c4 /dev | |
| parent | d7e7ec69c84db9c164dd546642ed0b638af766d3 (diff) | |
[nix] Update reference to nixpkgs
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/ci/nix/default.nix | 5 | ||||
| -rw-r--r-- | dev/ci/nix/quickchick.nix | 2 | ||||
| -rw-r--r-- | dev/nixpkgs.nix | 4 |
3 files changed, 6 insertions, 5 deletions
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"; }) |