Merge pull request from KarlJoad/octave/update-packages

This commit is contained in:
Doron Behar 2021-11-19 09:12:45 +02:00 committed by GitHub
commit 03a46c8b3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 47 additions and 20 deletions
pkgs
development
interpreters/octave
octave-modules
top-level

View file

@ -54,7 +54,23 @@
let
requiredOctavePackages' = computeRequiredOctavePackages requiredOctavePackages;
in stdenv.mkDerivation {
# Must use attrs.nativeBuildInputs before they are removed by the removeAttrs
# below, or everything fails.
nativeBuildInputs' = [
octave
writeRequiredOctavePackagesHook
]
++ nativeBuildInputs;
# This step is required because when
# a = { test = [ "a" "b" ]; }; b = { test = [ "c" "d" ]; };
# (a // b).test = [ "c" "d" ];
# This used to mean that if a package defined extra nativeBuildInputs, it
# would override the ones for building an Octave package (the hook and Octave
# itself, causing everything to fail.
attrs' = builtins.removeAttrs attrs [ "nativeBuildInputs" ];
in stdenv.mkDerivation ({
packageName = "${fullLibName}";
# The name of the octave package ends up being
# "octave-version-package-version"
@ -77,11 +93,7 @@ in stdenv.mkDerivation {
requiredOctavePackages = requiredOctavePackages';
nativeBuildInputs = [
octave
writeRequiredOctavePackagesHook
]
++ nativeBuildInputs;
nativeBuildInputs = nativeBuildInputs';
buildInputs = buildInputs ++ requiredOctavePackages';
@ -110,4 +122,4 @@ in stdenv.mkDerivation {
dontInstall = true;
inherit meta;
}
} // attrs')

View file

@ -9,11 +9,11 @@
buildOctavePackage rec {
pname = "audio";
version = "2.0.2";
version = "2.0.3";
src = fetchurl {
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
sha256 = "18lyvwmdy4b9pcv5sm7g17n3is32q23daw8fcsalkf4rj6cc6qdk";
sha256 = "1431pf7mhxsrnzrx8r3hsy537kha7jhaligmp2rghwyxhq25hs0r";
};
nativeBuildInputs = [

View file

@ -7,11 +7,11 @@
buildOctavePackage rec {
pname = "control";
version = "3.3.0";
version = "3.3.1";
src = fetchurl {
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
sha256 = "1yksifligq2z3siqw701iq2ydgnj7pnkcw42bfmydcf6fc4drlvy";
sha256 = "0vndbzix34vfzdlsz57bgkyg31as4kv6hfg9pwrcqn75bzzjsivw";
};
nativeBuildInputs = [

View file

@ -6,11 +6,11 @@
buildOctavePackage rec {
pname = "nan";
version = "3.5.3";
version = "3.6.0";
src = fetchurl {
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
sha256 = "1jailahbrh847875vszibn68lp4n5sdy68q51i7hd64qix8rmmpx";
sha256 = "1zxdg0yg5jnwq6ppnikd13zprazia6w6zpgw99f62mc03iqk5c4q";
};
buildInputs = [

View file

@ -6,11 +6,11 @@
buildOctavePackage rec {
pname = "sparsersb";
version = "1.0.8";
version = "1.0.9";
src = fetchurl {
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
sha256 = "0nl7qppa1cm51188hqhbfswlih9hmy1yz7v0f5i07z0g0kbd62xw";
sha256 = "0jyy2m7wylzyjqj9n6mjizhj0ccq8xnxm2g6pdlrmncxq1401khd";
};
propagatedBuildInputs = [

View file

@ -6,11 +6,11 @@
buildOctavePackage rec {
pname = "tsa";
version = "4.6.2";
version = "4.6.3";
src = fetchurl {
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
sha256 = "0p2cjszzjwhp4ih3q3r67qnikgxc0fwxc12p3727jbdvzq2h10mn";
sha256 = "1pbxq77xc7pn0ki6rpijlq9v7inn0hn2adkx1skgwffl7pivrwsl";
};
requiredOctavePackages = [

View file

@ -2,17 +2,32 @@
, lib
, fetchurl
, zeromq
, pkg-config
, autoreconfHook
}:
buildOctavePackage rec {
pname = "zeromq";
version = "1.5.2";
version = "1.5.3";
src = fetchurl {
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
sha256 = "18h1039ri7dr37jv20cvj5vhw7b57frrda0hhbvlgixinbqmn9j7";
sha256 = "1h0pb2pqbnyiavf7r05j8bqxqd8syz16ab48hc74nlnx727anfwl";
};
preAutoreconf = ''
cd src
'';
postAutoreconf = ''
cd ..
'';
nativeBuildInputs = [
pkg-config
autoreconfHook
];
propagatedBuildInputs = [
zeromq
];

View file

@ -214,7 +214,7 @@ makeScope newScope (self:
windows = callPackage ../development/octave-modules/windows { };
zeromq = callPackage ../development/octave-modules/zeromq {
inherit (pkgs) zeromq;
inherit (pkgs) zeromq autoreconfHook;
};
})