diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-07-21 15:41:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-21 15:41:22 +0100 |
commit | 218298b30fe79be30716438a1906d1abd61b9377 (patch) | |
tree | 65e0041ee5468689142d669c4c4fc4f73f3618ba /pkgs/applications/science | |
parent | cd6e2c9642b8e608c905f350cece21141435deef (diff) | |
parent | e85db6863a546cfdde0150f03ed0d2db28992575 (diff) |
Merge branch 'master' into unused5
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/logic/acgtk/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/science/math/sage/default.nix | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix index 9e6243c54980a..b787a4e7a01ce 100644 --- a/pkgs/applications/science/logic/acgtk/default.nix +++ b/pkgs/applications/science/logic/acgtk/default.nix @@ -4,8 +4,7 @@ installExamples ? true, installEmacsMode ? true }: -let inherit (stdenv.lib) versionAtLeast - optionals optionalString; in +let inherit (stdenv.lib) versionAtLeast optionalString; in let inherit (ocamlPackages) ocaml camlp4; in diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 1f540cc2b287a..63b751b814ee1 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -3,7 +3,7 @@ }: let - inherit (nixpkgs) fetchpatch fetchurl symlinkJoin fetchFromGitHub callPackage nodePackages_8_x; + inherit (nixpkgs) fetchpatch fetchurl symlinkJoin callPackage nodePackages_8_x; # https://trac.sagemath.org/ticket/15980 for tracking of python3 support python = nixpkgs.python2.override { |