lol

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

octave: 7.3.0 -> 8.1.0

authored by

Doron Behar and committed by
GitHub
e6dbca90 53ffab75

+47 -23
+4 -4
pkgs/development/interpreters/octave/default.nix
··· 15 15 , portaudio 16 16 , libX11 17 17 , graphicsmagick 18 - , pcre 18 + , pcre2 19 19 , pkg-config 20 20 , libGL 21 21 , libGLU ··· 112 112 }; 113 113 114 114 self = mkDerivation rec { 115 - version = "7.3.0"; 115 + version = "8.1.0"; 116 116 pname = "octave"; 117 117 118 118 src = fetchurl { 119 119 url = "mirror://gnu/octave/${pname}-${version}.tar.gz"; 120 - sha256 = "sha256-bhSkZJ1wr0WrZg+Mu/ZFqvHsM/JfiL/aRpfLF+RAxPU="; 120 + sha256 = "sha256-gFIHTRew72Q9A33oqziWcsdSuyAe6c6k36aYWPtqIT8="; 121 121 }; 122 122 123 123 buildInputs = [ ··· 127 127 flex 128 128 qhull 129 129 graphicsmagick 130 - pcre 130 + pcre2 131 131 fltk 132 132 zlib 133 133 curl
+2 -2
pkgs/development/octave-modules/control/default.nix
··· 7 7 8 8 buildOctavePackage rec { 9 9 pname = "control"; 10 - version = "3.4.0"; 10 + version = "3.5.1"; 11 11 12 12 src = fetchurl { 13 13 url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; 14 - sha256 = "sha256-bsagbhOtKIr62GMcxB9yR+RwlvoejQQkDU7QHvvkp3o="; 14 + sha256 = "sha256-U/o0RQoHdDhPP3xuiR9gCFb60CKrA30bpc/dH/ozDpg="; 15 15 }; 16 16 17 17 nativeBuildInputs = [
+11
pkgs/development/octave-modules/database/c_verror.patch
··· 1 + --- a/src/error-helpers.h 2 + +++ b/src/error-helpers.h 3 + @@ -64,7 +64,7 @@ 4 + } \ 5 + catch (OCTAVE__EXECUTION_EXCEPTION& e) \ 6 + { \ 7 + - verror (e, __VA_ARGS__); \ 8 + + c_verror (e, __VA_ARGS__); \ 9 + } 10 + #endif 11 +
+4
pkgs/development/octave-modules/database/default.nix
··· 13 13 url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; 14 14 sha256 = "1c0n76adi0jw6bx62s04vjyda6kb6ca8lzz2vam43vdy10prcq9p"; 15 15 }; 16 + patches = [ 17 + # Fix for octave 8.x 18 + ./c_verror.patch 19 + ]; 16 20 17 21 propagatedBuildInputs = [ 18 22 postgresql
+2 -2
pkgs/development/octave-modules/doctest/default.nix
··· 5 5 6 6 buildOctavePackage rec { 7 7 pname = "doctest"; 8 - version = "0.7.0"; 8 + version = "0.8.0"; 9 9 10 10 src = fetchurl { 11 11 url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; 12 - sha256 = "0hh9izj9ds69bmrvmmj16fd1c4z7733h50c7isl8f714srw26kf4"; 12 + sha256 = "sha256-/oXJ7NnbbdsVfhNOYU/tkkYwKhYs5zKMEjybmbf0Cok="; 13 13 }; 14 14 15 15 meta = with lib; {
+2
pkgs/development/octave-modules/image-acquisition/default.nix
··· 28 28 The Octave-forge Image Aquisition package provides functions to 29 29 capture images from connected devices. Currently only v4l2 is supported. 30 30 ''; 31 + # Got broke with octave 8.x update, and wasn't updated since 2015 32 + broken = true; 31 33 }; 32 34 }
+3 -3
pkgs/development/octave-modules/level-set/default.nix
··· 23 23 # corrected to have a %s format specifier. However, logic_error() also 24 24 # exists, (a simple regex also matches that), but logic_error() doesn't 25 25 # require a format specifier. So, this regex was born to handle that... 26 - patchPhase = '' 26 + postPatch = '' 27 27 substituteInPlace build.sh --replace "level-set-0.3.1" "${pname}-${version}" \ 28 28 --replace "\`pwd\`" '/build' 29 29 sed -i -E 's#[^[:graph:]]error \(# error \(\"%s\", #g' src/*.cpp ··· 51 51 license = licenses.gpl3Plus; 52 52 maintainers = with maintainers; [ KarlJoad ]; 53 53 description = "Routines for calculating the time-evolution of the level-set equation and extracting geometric information from the level-set function"; 54 - # /build/level-set-2019-04-13.tar.gz: Cannot open: No such file or directory 55 - broken = stdenv.isDarwin; 54 + # Got broke with octave 8.x update, and wasn't updated since 2019 55 + broken = true; 56 56 }; 57 57 }
+2 -2
pkgs/development/octave-modules/ltfat/default.nix
··· 13 13 14 14 buildOctavePackage rec { 15 15 pname = "ltfat"; 16 - version = "2.3.1"; 16 + version = "2.5.0"; 17 17 18 18 src = fetchurl { 19 19 url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; 20 - sha256 = "0gghh5a4w649ff776wvidfvqas87m0n7rqs960pid1d11bnyqqrh"; 20 + sha256 = "sha256-CFLqlHrTwQzCvpPAtQigCVL3Fs8V05Tmh6nkEsnaV2I="; 21 21 }; 22 22 23 23 patches = [
+2 -2
pkgs/development/octave-modules/ocl/default.nix
··· 6 6 7 7 buildOctavePackage rec { 8 8 pname = "ocl"; 9 - version = "1.2.0"; 9 + version = "1.2.1"; 10 10 11 11 src = fetchurl { 12 12 url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; 13 - sha256 = "sha256-jQdwZwQNU3PZZFa3lp0hIr0GDt/XFHLJoq4waLI4gS8="; 13 + sha256 = "sha256-NVUefSGv5/l1B7sES7NG1gU8Ms2gfmb8OGxQrhzWlus="; 14 14 }; 15 15 16 16 meta = with lib; {
+6
pkgs/development/octave-modules/parallel/default.nix
··· 14 14 url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; 15 15 sha256 = "1h8vw2r42393px6dk10y3lhpxl168r9d197f9whz6lbk2rg571pa"; 16 16 }; 17 + patches = [ 18 + ../database/c_verror.patch 19 + ]; 17 20 18 21 nativeBuildInputs = [ 19 22 pkg-config ··· 32 35 license = licenses.gpl3Plus; 33 36 maintainers = with maintainers; [ KarlJoad ]; 34 37 description = "Parallel execution package"; 38 + # Although upstream has added an identical patch to that of ../database, it 39 + # still won't build with octave>8.1 40 + broken = true; 35 41 }; 36 42 }
+2
pkgs/development/octave-modules/sparsersb/default.nix
··· 22 22 license = licenses.gpl3Plus; 23 23 maintainers = with maintainers; [ KarlJoad ]; 24 24 description = "Interface to the librsb package implementing the RSB sparse matrix format for fast shared-memory sparse matrix computations"; 25 + # Broken since octave>8.x 26 + broken = true; 25 27 }; 26 28 }
+2 -2
pkgs/development/octave-modules/stk/default.nix
··· 5 5 6 6 buildOctavePackage rec { 7 7 pname = "stk"; 8 - version = "2.7.0"; 8 + version = "2.8.0"; 9 9 10 10 src = fetchurl { 11 11 url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; 12 - sha256 = "sha256-vIf+XDLvLNOMwptFCgiqfl+o3PIQ+KLpsJhOArd7gMM="; 12 + sha256 = "sha256-dgxpw2L7e9o/zimsLPoqW7dEihrrNsks62XtuXt4zTI="; 13 13 }; 14 14 15 15 meta = with lib; {
+3 -3
pkgs/development/octave-modules/symbolic/default.nix
··· 14 14 in 15 15 buildOctavePackage rec { 16 16 pname = "symbolic"; 17 - version = "3.0.1"; 17 + version = "3.1.1"; 18 18 19 19 src = fetchFromGitHub { 20 20 owner = "cbm755"; 21 21 repo = "octsympy"; 22 - rev = "v${version}"; 23 - hash = "sha256-FJb5uazqEiyNI6TL9WVewMoQnC3CutcHENl+umNZeto="; 22 + rev = "refs/tags/v${version}"; 23 + hash = "sha256-6LmLzTwcBhvMDBE7u/lIkSUP97qFMPRHkxfbAyvas6M="; 24 24 }; 25 25 26 26 propagatedBuildInputs = [ pythonEnv ];
+2 -3
pkgs/development/octave-modules/tisean/default.nix
··· 1 1 { buildOctavePackage 2 - , stdenv 3 2 , lib 4 3 , fetchurl 5 4 # Octave dependencies ··· 30 29 license = licenses.gpl3Plus; 31 30 maintainers = with maintainers; [ KarlJoad ]; 32 31 description = "Port of TISEAN 3.0.1"; 33 - # Some gfortran symbols claimed to be missing 34 - broken = stdenv.isDarwin; 32 + # Broken since octave 8.x update, and wasn't updated since 2021 33 + broken = true; 35 34 }; 36 35 }