diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-04-10 00:02:52 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-10 00:02:52 +0000 |
commit | 28c6c88d427cb50a01fdff7addbfb74ac53c58e5 (patch) | |
tree | ced75fea58ceb8e4054c45624caa1ae4ee94720b /pkgs/development/interpreters | |
parent | fa7edde95b0b09e2aa7267da7843734b0ca750ac (diff) | |
parent | a11494d83b1092b33da71ade38945e035a8783c5 (diff) | |
download | nixpkgs-28c6c88d427cb50a01fdff7addbfb74ac53c58e5.tar nixpkgs-28c6c88d427cb50a01fdff7addbfb74ac53c58e5.tar.gz nixpkgs-28c6c88d427cb50a01fdff7addbfb74ac53c58e5.tar.bz2 nixpkgs-28c6c88d427cb50a01fdff7addbfb74ac53c58e5.tar.lz nixpkgs-28c6c88d427cb50a01fdff7addbfb74ac53c58e5.tar.xz nixpkgs-28c6c88d427cb50a01fdff7addbfb74ac53c58e5.tar.zst nixpkgs-28c6c88d427cb50a01fdff7addbfb74ac53c58e5.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/interpreters')
-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 1bd78a8a2d4..2fcdab95509 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; |