diff options
author | Peter Simons <simons@cryp.to> | 2014-07-28 11:43:20 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2014-07-28 11:43:20 +0200 |
commit | d0ca8c237ec001ef176c82faf6b8104e83453ac9 (patch) | |
tree | 50b3077cd9efca0ff76aed180399b70bf5ec20bc /pkgs/applications/science/math | |
parent | ad934ccc2234a3cb314ece42f693b4a708e7e3ee (diff) | |
download | nixpkgs-d0ca8c237ec001ef176c82faf6b8104e83453ac9.tar nixpkgs-d0ca8c237ec001ef176c82faf6b8104e83453ac9.tar.gz nixpkgs-d0ca8c237ec001ef176c82faf6b8104e83453ac9.tar.bz2 nixpkgs-d0ca8c237ec001ef176c82faf6b8104e83453ac9.tar.lz nixpkgs-d0ca8c237ec001ef176c82faf6b8104e83453ac9.tar.xz nixpkgs-d0ca8c237ec001ef176c82faf6b8104e83453ac9.tar.zst nixpkgs-d0ca8c237ec001ef176c82faf6b8104e83453ac9.zip |
Fix broken license references.
Diffstat (limited to 'pkgs/applications/science/math')
-rw-r--r-- | pkgs/applications/science/math/gap/default.nix | 19 | ||||
-rw-r--r-- | pkgs/applications/science/math/singular/default.nix | 10 |
2 files changed, 15 insertions, 14 deletions
diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index 49a46e0c8b2..74fff2390a3 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -1,10 +1,10 @@ x@{builderDefsPackage - , pari ? null + , pari ? null , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -44,14 +44,14 @@ rec { tar xf "${pkgSrc}" -C "$out/share/gap/build-dir/pkg" - ${if a.pari != null then - ''sed -e '2iexport PATH=$PATH:${pari}/bin' -i "$out/share/gap/build-dir/bin/gap.sh" '' + ${if a.pari != null then + ''sed -e '2iexport PATH=$PATH:${pari}/bin' -i "$out/share/gap/build-dir/bin/gap.sh" '' else ""} - sed -e "/GAP_DIR=/aGAP_DIR='$out/share/gap/build-dir/'" -i "$out/share/gap/build-dir/bin/gap.sh" + sed -e "/GAP_DIR=/aGAP_DIR='$out/share/gap/build-dir/'" -i "$out/share/gap/build-dir/bin/gap.sh" ln -s "$out/share/gap/build-dir/bin/gap.sh" "$out/bin" '' ["doMake" "minInit" "defEnsureDir"]; - + meta = { description = "Computational discrete algebra system"; maintainers = with a.lib.maintainers; @@ -60,7 +60,8 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = stdenv.lib.licenses.gpl2; + license = with a.lib.licenses; + gpl2; homepage = "http://gap-system.org/"; }; }) x diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 8a9f4e1d723..1afb510e994 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -3,9 +3,9 @@ x@{builderDefsPackage , coreutils , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -40,7 +40,7 @@ rec { mkdir -p "$out/bin" ln -s "$out/"*/Singular "$out/bin" '') ["minInit" "defEnsureDir"]; - + meta = { description = "A CAS for polynomial computations"; maintainers = with a.lib.maintainers; @@ -49,7 +49,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = stdenv.lib.licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 + license = a.stdenv.lib.licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 homepage = "http://www.singular.uni-kl.de/index.php"; }; passthru = { |