diff options
| author | Vincent Laporte | 2019-01-31 09:21:33 +0000 |
|---|---|---|
| committer | Vincent Laporte | 2019-01-31 09:21:33 +0000 |
| commit | c69fd5fa6d0f2c596e757390ea92c71703ee035c (patch) | |
| tree | c52a5e271e7a55c255501c5353ef566795500a07 | |
| parent | 81c6a88eb261c9e130aff73f2d5bc1ee1f7e0758 (diff) | |
| parent | afdea7f8f812a4f040a325fef363dd16dd0628c3 (diff) | |
Merge PR #9442: Update pinned nixpkgs.
Ack-by: Zimmi48
Reviewed-by: vbgl
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | default.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5382eaffdd..0b2d56fa3e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -294,7 +294,7 @@ pkg:opam: variables: # By default we use coq.cachix.org as an extra substituter but this can be overridden EXTRA_SUBSTITUTERS: https://coq.cachix.org - EXTRA_PUBLIC_KEYS: coq.cachix.org-1:Jgt0DwGAUo+wpxCM52k2V+E0hLoOzFPzvg94F65agtI= + EXTRA_PUBLIC_KEYS: coq.cachix.org-1:5QW/wwEnD+l2jvN6QRbRRsa4hBHG3QiQQ26cxu1F5tI= # The following variables should not be overridden GIT_STRATEGY: none NIXOS_PUBLIC_KEY: cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= diff --git a/default.nix b/default.nix index 89d69cc40f..b65d736d79 100644 --- a/default.nix +++ b/default.nix @@ -23,10 +23,10 @@ { pkgs ? (import (fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/958a6c6dd39b0d6628e1408e798a8f1308f2f3e1.tar.gz"; - sha256 = "0vs6k4jn0rbdfzaxmh3xh64q213326680i9g3cjgr7l9y6h6m5sy"; + url = "https://github.com/NixOS/nixpkgs/archive/11cf7d6e1ffd5fbc09a51b76d668ad0858a772ed.tar.gz"; + sha256 = "0zcg4mgfdk3ryiqj1j5iv5bljjvsgi6q6j9z1vkq383c4g4clc72"; }) {}) -, ocamlPackages ? pkgs.ocaml-ng.ocamlPackages_4_06 +, ocamlPackages ? pkgs.ocamlPackages , buildIde ? true , buildDoc ? true , doInstallCheck ? true |