diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-03 09:00:23 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-03 09:00:23 +0200 |
| commit | 8e97d0be6bf0b381935e3b8429430d645dc2e226 (patch) | |
| tree | c7c981528854fc55a9aed6a2445f4e8172ea9ea0 /pkgs/applications/science | |
| parent | 3ad01beda76c038e52e8f4524d5f3c409e0b6e36 (diff) | |
| parent | 25a77b72106922b055d1e1f1883c164d34b17311 (diff) | |
| download | nixlib-8e97d0be6bf0b381935e3b8429430d645dc2e226.tar nixlib-8e97d0be6bf0b381935e3b8429430d645dc2e226.tar.gz nixlib-8e97d0be6bf0b381935e3b8429430d645dc2e226.tar.bz2 nixlib-8e97d0be6bf0b381935e3b8429430d645dc2e226.tar.lz nixlib-8e97d0be6bf0b381935e3b8429430d645dc2e226.tar.xz nixlib-8e97d0be6bf0b381935e3b8429430d645dc2e226.tar.zst nixlib-8e97d0be6bf0b381935e3b8429430d645dc2e226.zip | |
Merge staging into staging-next
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/math/sage/sage-tests.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/science/math/sage/sage.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/applications/science/math/sage/sage-tests.nix index 12433e12fe90..591fa192d563 100644 --- a/pkgs/applications/science/math/sage/sage-tests.nix +++ b/pkgs/applications/science/math/sage/sage-tests.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { sage-with-env ]; - unpackPhase = "#do nothing"; + dontUnpack = true; configurePhase = "#do nothing"; buildPhase = "#do nothing"; diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix index 541b9cb36dc2..f6dc21d00184 100644 --- a/pkgs/applications/science/math/sage/sage.nix +++ b/pkgs/applications/science/math/sage/sage.nix @@ -11,7 +11,7 @@ # A wrapper that makes sure sage finds its docs (if they were build) and the # jupyter kernel spec. -let +let # generate kernel spec + default kernels kernel-specs = jupyter-kernel.create { definitions = jupyter-kernel.default // { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sage-tests ]; - unpackPhase = "#do nothing"; + dontUnpack = true; configurePhase = "#do nothing"; buildPhase = "#do nothing"; |