gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #328318 from r-ryantm/auto-update/octave

Browse Source 
octave: 8.4.0 -> 9.2.0
This commit is contained in:
Doron Behar
2024-07-22 09:15:42 +03:00
committed by GitHub
parent ac81de7720 29340b7706
commit 19bc619c1c
5 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/octave/default.nix
+2 -2
View File
@@ -93,12 +93,12 @@ let
# To avoid confusion later in passthru
allPkgs = pkgs;
in stdenv.mkDerivation (finalAttrs: {
version = "8.4.0";
version = "9.2.0";
pname = "octave";
src = fetchurl {
url = "mirror://gnu/octave/octave-${finalAttrs.version}.tar.gz";
sha256 = "sha256-azjdl1FnhCSus6nWZkMrHzeOs5caISkKkM09NRGdVq0=";
sha256 = "sha256-BjZVSwWZaZfkMcqtRCLAA4bS18aJAEcnAP7PX/63yZE=";
};
buildInputs = [
pkgs/development/libraries/qrupdate/default.nix
+5
View File
@@ -30,6 +30,11 @@ stdenv.mkDerivation (finalAttrs: {
])}"
];
# https://github.com/mpimd-csc/qrupdate-ng/issues/4
patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
./disable-zch1dn-test.patch
];
doCheck = true;
nativeBuildInputs = [
pkgs/development/libraries/qrupdate/disable-zch1dn-test.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git i/test/tch1dn.f w/test/tch1dn.f
index 25ec990..3f83e7e 100644
--- i/test/tch1dn.f
+++ w/test/tch1dn.f
@@ -34,8 +34,6 @@ c
call dtest(n)
write (*,*) 'cch1dn test:'
call ctest(n)
- write (*,*) 'zch1dn test:'
- call ztest(n)
call pstats
end program
pkgs/development/octave-modules/ncarray/default.nix
+2 -2
View File
@@ -7,11 +7,11 @@
buildOctavePackage rec {
pname = "ncarray";
version = "1.0.5";
version = "1.0.6";
src = fetchurl {
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
sha256 = "sha256-HhQWLUA/6wqYi6TP3PC+N2zgi4UojDxbG9pgQzFaQ8c=";
sha256 = "sha256-W6L2Esm7AdzntT7cimKylbeKYcZWKhHim96N5dM/qoE=";
};
buildInputs = [
pkgs/development/octave-modules/netcdf/default.nix
+2 -2
View File
@@ -6,11 +6,11 @@
buildOctavePackage rec {
pname = "netcdf";
version = "1.0.16";
version = "1.0.17";
src = fetchurl {
url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
sha256 = "sha256-1Lr+6xLRXxSeUhM9+WdCUPFRZSWdxtAQlxpiv4CHJrs=";
sha256 = "sha256-uuFD8VNeWbyHFyWMDMzWDd2n+dG9EFmc/JnZU2tx+Uk=";
};
buildInputs = [