diff options
-rw-r--r-- | pkgs/development/compilers/gambit/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/gambit/unstable.nix | 10 | ||||
-rw-r--r-- | pkgs/development/compilers/gerbil/default.nix | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/gerbil/unstable.nix | 11 | ||||
-rw-r--r-- | pkgs/development/coq-modules/coq-ext-lib/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/security/vault/default.nix | 14 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
7 files changed, 28 insertions, 24 deletions
diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 77e8fb51602c..36aa73f7274b 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl }: +{ stdenv, callPackage, fetchurl }: callPackage ./build.nix { version = "4.8.9"; @@ -7,4 +7,5 @@ callPackage ./build.nix { url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v4_8_9-devel.tgz"; sha256 = "1gwzz1ag9hlv266nvfq1bhwzrps3f2yghhffasjjqy8i8xwnry5p"; }; + inherit stdenv; } diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index 169ddb5a6a31..41d0ee930bf0 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -1,10 +1,12 @@ -{ callPackage, fetchgit }: +{ stdenv, callPackage, fetchgit }: callPackage ./build.nix { - version = "unstable-2018-05-30"; + version = "unstable-2018-08-06"; +# git-version = "4.8.9-77-g91a4ad2c"; SRC = fetchgit { url = "https://github.com/feeley/gambit.git"; - rev = "ffe8841b56330eb86fd794b16dc7f83914ecc7c5"; - sha256 = "1xzkwa2f6zazybbgd5zynhr36krayhr29vsbras5ld63hkrxrp7q"; + rev = "91a4ad2c28375f067adedcaa61f9d66a4b536f4f"; + sha256 = "0px1ipvhh0hz8n38h6jv4y1nn163j8llvcy4l7p3hkdns5czwy1p"; }; + inherit stdenv; } diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index eaab0e71d3bd..6fa9fcc3de88 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, gambit }: +{ stdenv, callPackage, fetchurl, gambit }: callPackage ./build.nix { version = "0.12-RELEASE"; @@ -8,4 +8,5 @@ callPackage ./build.nix { url = "https://github.com/vyzo/gerbil/archive/v0.12.tar.gz"; sha256 = "0nigr3mgrzai57q2jqac8f39zj8rcmic3277ynyzlgm8hhps71pq"; }; + inherit stdenv; } diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix index 25c6b75fa03e..66ead04b5429 100644 --- a/pkgs/development/compilers/gerbil/unstable.nix +++ b/pkgs/development/compilers/gerbil/unstable.nix @@ -1,12 +1,13 @@ -{ callPackage, fetchgit, gambit-unstable }: +{ stdenv, callPackage, fetchgit, gambit-unstable }: callPackage ./build.nix { - version = "unstable-2018-05-12"; - git-version = "0.13-DEV-437-gaefdb47f"; + version = "unstable-2018-08-11"; + git-version = "0.13-DEV-542-g274e1a22"; GAMBIT = gambit-unstable; SRC = fetchgit { url = "https://github.com/vyzo/gerbil.git"; - rev = "aefdb47f3d1ceaa735fd5c3dcaac2aeb0d4d2436"; - sha256 = "0xhsilm5kix5lsmykv273npp1gk6dgx9axh266mimwh7j0nxf7ms"; + rev = "274e1a22b2d2b708d5582594274ab52ee9ba1686"; + sha256 = "10j44ar4xfl8xmh276zg1ykd3r0vy7w2f2cg4p8slwnk9r251g2s"; }; + inherit stdenv; } diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index 877331383a7d..5e6ee7fac6f1 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -4,7 +4,8 @@ let params = { "8.5" = { version = "0.9.4"; sha256 = "1y66pamgsdxlq2w1338lj626ln70cwj7k53hxcp933g8fdsa4hp0"; }; "8.6" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; }; - "8.7" = { version = "0.9.5"; sha256 = "1b4cvz3llxin130g13calw5n1zmvi6wdd5yb8a41q7yyn2hd3msg"; }; + "8.7" = { version = "0.9.7"; sha256 = "00v4bm4glv1hy08c8xsm467az6d1ashrznn8p2bmbmmp52lfg7ag"; }; + "8.8" = { version = "0.9.8"; sha256 = "0z1ix855kdjl7zw5ca664h5njd1x8mmvf5wi37fck4dj9dgamwlz"; }; }; param = params."${coq.coq-version}"; in diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 2c422d516046..a9e8d8fca351 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -9,28 +9,26 @@ let }; in stdenv.mkDerivation rec { name = "vault-${version}"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "16sndzbfciw4bccxm7sc83y2pma2bgsmc1kqyb2hp0jsdy4rl3k4"; + sha256 = "1f11arvj7zp8wwkvv3nn7kyga0ci8psdif6djrnzwjksskdgdbx5"; }; nativeBuildInputs = [ go gox removeReferencesTo ]; - buildPhase = '' + preBuild = '' patchShebangs ./ substituteInPlace scripts/build.sh --replace 'git rev-parse HEAD' 'echo ${src.rev}' sed -i s/'^GIT_DIRTY=.*'/'GIT_DIRTY="+NixOS"'/ scripts/build.sh - mkdir -p src/github.com/hashicorp + mkdir -p .git/hooks src/github.com/hashicorp ln -s $(pwd) src/github.com/hashicorp/vault - mkdir -p .git/hooks - - GOPATH=$(pwd) make + export GOPATH=$(pwd) ''; installPhase = '' @@ -47,6 +45,6 @@ in stdenv.mkDerivation rec { description = "A tool for managing secrets"; platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; - maintainers = with maintainers; [ rushmorem offline pradeepchhetri ]; + maintainers = with maintainers; [ rushmorem lnl7 offline pradeepchhetri ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26fef8cb1d7d..68ae83334822 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6344,10 +6344,10 @@ with pkgs; fpc = callPackage ../development/compilers/fpc { }; - gambit = callPackage ../development/compilers/gambit { }; - gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { }; - gerbil = callPackage ../development/compilers/gerbil { }; - gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { }; + gambit = callPackage ../development/compilers/gambit { stdenv = gccStdenv; }; + gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { stdenv = gccStdenv; }; + gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; }; + gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; }; gccFun = callPackage ../development/compilers/gcc/7; gcc = gcc7; |