diff --git a/pkgs/development/interpreters/octave/build-env.nix b/pkgs/development/interpreters/octave/build-env.nix index 373567d92cc5..a56dcd7dd4df 100644 --- a/pkgs/development/interpreters/octave/build-env.nix +++ b/pkgs/development/interpreters/octave/build-env.nix @@ -69,10 +69,14 @@ buildEnv { touch $out/.octave_packages for path in ${lib.concatStringsSep " " packages}; do if [ -e $path/*.tar.gz ]; then + # Glob-match here so that we grab the paths of all tarballs produced + # by "octave build" in buildOctavePackage's buildPhase. We can then + # Use this list later. + pkg_tarballs=($path/*.tar.gz) $out/bin/octave-cli --eval "pkg local_list $out/.octave_packages; \ pkg prefix $out/${octave.octPkgsPath} $out/${octave.octPkgsPath}; \ pfx = pkg (\"prefix\"); \ - pkg install -nodeps -local $path/*.tar.gz" + pkg install -nodeps -local $pkg_tarballs" fi done diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 987a08f478ef..3d5a697f35d3 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -23,6 +23,7 @@ # Both are needed for discrete Fourier transform fftw, fftwSinglePrec, + fast-float, zlib, curl, rapidjson, @@ -99,12 +100,12 @@ let allPkgs = pkgs; in stdenv.mkDerivation (finalAttrs: { - version = "10.3.0"; + version = "11.1.0"; pname = "octave"; src = fetchurl { url = "mirror://gnu/octave/octave-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-L8s43AYuRA8eBsBpu8qEDtRtzI+YPkc+FVj8w4OE7ms="; + sha256 = "sha256-wOfiyRvFcyVkMbLMmJKQub0ThR263VnQrHRxTxM0sOY="; }; postPatch = '' @@ -155,6 +156,9 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + fast-float ]; nativeBuildInputs = [ perl @@ -176,6 +180,8 @@ stdenv.mkDerivation (finalAttrs: { lib.optionalAttrs stdenv.hostPlatform.isDarwin { # Fix linker error on Darwin (see https://trac.macports.org/ticket/61865) NIX_LDFLAGS = "-lobjc"; + # https://savannah.gnu.org/bugs/index.php?68042 + NIX_CFLAGS_COMPILE = "-Wno-format-security"; } // lib.optionalAttrs use64BitIdx { # See https://savannah.gnu.org/bugs/?50339