From 61d36dfc8df32aee46433d51f46e485484d77d1c Mon Sep 17 00:00:00 2001 From: Karl Hallsby Date: Wed, 6 Jan 2021 23:59:28 -0600 Subject: [PATCH] octave/linear-algebra: fix numerous small issues octave/linear-algebra: switch to pkgs.fetchurl This prevents a download during the evaluation of a package (Time when the .drv is generated), and delays it to the build time of the package. Also, this is the required default in nixpkgs. octave/linear-algebra: fix meta.licenses -> meta.license --- pkgs/development/octave-modules/linear-algebra/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/octave-modules/linear-algebra/default.nix b/pkgs/development/octave-modules/linear-algebra/default.nix index bdf45b9a170b1..7059ceb9096b0 100644 --- a/pkgs/development/octave-modules/linear-algebra/default.nix +++ b/pkgs/development/octave-modules/linear-algebra/default.nix @@ -8,14 +8,15 @@ buildOctaveLibrary rec { pname = "linear-algebra"; version = "2.2.3"; - src = builtins.fetchurl { + src = fetchurl { url = "https://octave.sourceforge.io/download.php?package=${pname}-${version}.tar.gz"; sha256 = "1wwjpxp9vjc6lszh0z3kgy4hyzpib8rvvh6b74ijh9qk9r9nmvjk"; }; meta = with stdenv.lib; { homepage = "https://octave.sourceforge.io/${pname}/index.html"; - licenses = with licenses; [ gpl3Plus lgpl3Plus bsd ]; + license = with licenses; [ gpl3Plus lgpl3Plus ]; + # They claim to have a FreeBSD license, but none of their code seems to have it. maintainers = with maintainers; [ KarlJoad ]; description = "Additional linear algebra code, including matrix functions"; };