diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-14 23:33:03 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-14 23:33:03 -0400 |
| commit | 5e17335bd7ff853379122e08dadfaa2fc1c020b7 (patch) | |
| tree | 911e75d700bebef1aa60fedcaa6a29b5032d6428 /pkgs/development/interpreters/guile | |
| parent | 330ca731e88ec015181c43d92ae8f7c77cf0226a (diff) | |
| parent | 0fc21a364bfd6b2dea9010fdf21415ff3de1805a (diff) | |
Merge remote-tracking branch 'upstream/staging' into strictDeps
Diffstat (limited to 'pkgs/development/interpreters/guile')
| -rw-r--r-- | pkgs/development/interpreters/guile/1.8.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/interpreters/guile/2.0.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/interpreters/guile/default.nix | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index 658b2cce77f9..53db5949f02b 100644 --- a/pkgs/development/interpreters/guile/1.8.nix +++ b/pkgs/development/interpreters/guile/1.8.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { # This is fixed here: # <http://git.savannah.gnu.org/cgit/guile.git/commit/?h=branch_release-1-8&id=a0aa1e5b69d6ef0311aeea8e4b9a94eae18a1aaf>. doCheck = false; + doInstallCheck = doCheck; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index 3a11dc78c6cb..b0eeb89ce431 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -89,6 +89,7 @@ # make check doesn't work on darwin # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper. doCheck = false; + doInstallCheck = doCheck; setupHook = ./setup-hook-2.0.sh; diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 748b3c5e200a..196c899fcea9 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -85,6 +85,7 @@ # make check doesn't work on darwin # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper. doCheck = false; + doInstallCheck = doCheck; setupHook = ./setup-hook-2.2.sh; |