diff options
author | Doron Behar <doron.behar@gmail.com> | 2022-04-09 23:40:46 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-09 23:40:46 +0300 |
commit | 13c8900b5c4e288493df29e50f6ea82033894add (patch) | |
tree | b474ff69a32fc46caa9719ecadf01e40a3fd65e2 /pkgs/development | |
parent | 7715286357ee0138cb82b7958a0566283e20dfee (diff) | |
parent | 88e6baf83235bcca1e4335f5978f69b4126f70cf (diff) |
Merge pull request #167900 from r-ryantm/auto-update/octave
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/interpreters/octave/default.nix | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 1bd78a8a2d4e4..2fcdab95509e7 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -58,9 +58,6 @@ , qtscript ? null , qscintilla ? null , qttools ? null -# - JIT compiler for loops: -, enableJIT ? false -, llvm ? null , libiconv , darwin }: @@ -114,12 +111,12 @@ let }; self = mkDerivation rec { - version = "6.4.0"; + version = "7.1.0"; pname = "octave"; src = fetchurl { url = "mirror://gnu/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-tI8z1Pzq85TPvqc6jIUAAJNtg6QXOaJPdWi1sKezms0="; + sha256 = "sha256-1KnYHz9ntKbgfLeoDcsQrV6RdvzDB2LHCoFYCmS4sLY="; }; buildInputs = [ @@ -173,7 +170,6 @@ let texinfo ] ++ lib.optionals (sundials != null) [ sundials ] - ++ lib.optionals enableJIT [ llvm ] ++ lib.optionals enableQt [ qtscript qttools @@ -199,7 +195,6 @@ let ++ lib.optionals enableReadline [ "--enable-readline" ] ++ lib.optionals stdenv.isDarwin [ "--with-x=no" ] ++ lib.optionals enableQt [ "--with-qt=5" ] - ++ lib.optionals enableJIT [ "--enable-jit" ] ; # Keep a copy of the octave tests detailed results in the output @@ -220,7 +215,7 @@ let inherit portaudio; inherit jdk; inherit python; - inherit enableQt enableJIT enableReadline enableJava; + inherit enableQt enableReadline enableJava; buildEnv = callPackage ./build-env.nix { octave = self; inherit octavePackages wrapOctave; @@ -236,8 +231,6 @@ let license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ raskin doronbehar ]; description = "Scientific Programming Language"; - # https://savannah.gnu.org/bugs/?func=detailitem&item_id=56425 is the best attempt to fix JIT - broken = enableJIT; platforms = if overridePlatforms == null then (lib.platforms.linux ++ lib.platforms.darwin) else overridePlatforms; |