diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 45d35d027b88..c2e1454aef9f 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -112,12 +112,12 @@ let }; self = mkDerivation rec { - version = "8.1.0"; + version = "8.2.0"; pname = "octave"; src = fetchurl { url = "mirror://gnu/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-gFIHTRew72Q9A33oqziWcsdSuyAe6c6k36aYWPtqIT8="; + sha256 = "sha256-V9F/kYqUDTjKM0ghHhELNNc1oyKofbccF3xGkqSanIQ="; }; buildInputs = [ diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index 7868214e6cd7..6a88fae3737c 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "6.5.0"; + version = "6.5.1"; outputs = [ "out" "examples" ]; src = fetchurl { url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz"; - hash = "sha256-TguZjf8pKiYX4Xlgm1ObUR64CDb1+qz4AOaIqIYohQI="; + hash = "sha256-QlIwOAUXHk290ZoB5Swdz+Da/FmcPP7bClwv+wRainU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/octave-modules/ltfat/default.nix b/pkgs/development/octave-modules/ltfat/default.nix index 829f6eb9287e..9d9dba0b01e4 100644 --- a/pkgs/development/octave-modules/ltfat/default.nix +++ b/pkgs/development/octave-modules/ltfat/default.nix @@ -16,15 +16,10 @@ buildOctavePackage rec { version = "2.5.0"; src = fetchurl { - url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-CFLqlHrTwQzCvpPAtQigCVL3Fs8V05Tmh6nkEsnaV2I="; + url = "https://github.com/ltfat/ltfat/releases/download/v${version}/${pname}-${version}-of.tar.gz"; + sha256 = "sha256-8AqEDEfgYwftKUj8ynFQzBa3G3zTdhNtsZ2bW16DV7Q="; }; - patches = [ - # Fixes a syntax error with performing multiplication. - ./syntax-error.patch - ]; - buildInputs = [ fftw fftwSinglePrec diff --git a/pkgs/development/octave-modules/ltfat/syntax-error.patch b/pkgs/development/octave-modules/ltfat/syntax-error.patch deleted file mode 100644 index 732030b70434..000000000000 --- a/pkgs/development/octave-modules/ltfat/syntax-error.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/inst/nonstatgab/nsdgt.m b/inst/nonstatgab/nsdgt.m -index ac53963..81656cb 100644 ---- a/inst/nonstatgab/nsdgt.m -+++ b/inst/nonstatgab/nsdgt.m -@@ -149,8 +149,8 @@ for ii = 1:N - col = ceil(Lg/M(ii)); - - temp = zeros(col*M(ii),W,assert_classname(f,g{1})); -- temp([end-floor(Lg/2)+1:end,1:ceil(Lg/2)],:) = bsxfun(@ ... -- times,f(win_range,:),g{ii}(idx)); -+ temp([end-floor(Lg/2)+1:end,1:ceil(Lg/2)],:) = bsxfun(@times, ... -+ f(win_range,:),g{ii}(idx)); - - temp = reshape(temp,M(ii),col,W); - X = squeeze(fft(sum(temp,2))); diff --git a/pkgs/development/octave-modules/stk/default.nix b/pkgs/development/octave-modules/stk/default.nix index 0b161c261c40..192115309fa7 100644 --- a/pkgs/development/octave-modules/stk/default.nix +++ b/pkgs/development/octave-modules/stk/default.nix @@ -8,7 +8,7 @@ buildOctavePackage rec { version = "2.8.0"; src = fetchurl { - url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; + url = "https://github.com/stk-kriging/stk/releases/download/${version}/${pname}-${version}-octpkg.tar.gz"; sha256 = "sha256-dgxpw2L7e9o/zimsLPoqW7dEihrrNsks62XtuXt4zTI="; }; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 29bc6e601e65..1c4d6506b72e 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -9,6 +9,7 @@ , pythonSupport ? stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.hostPlatform.isCygwin, python3 ? null , enableDebuginfod ? false, elfutils , guile ? null +, hostCpuOnly ? false , safePaths ? [ # $debugdir:$datadir/auto-load are whitelisted by default by GDB "$debugdir" "$datadir/auto-load" @@ -27,7 +28,7 @@ in assert pythonSupport -> python3 != null; stdenv.mkDerivation rec { - pname = targetPrefix + basename; + pname = targetPrefix + basename + lib.optionalString hostCpuOnly "-host-cpu-only"; version = "13.1"; src = fetchurl { @@ -94,7 +95,8 @@ stdenv.mkDerivation rec { "--program-prefix=${targetPrefix}" "--disable-werror" - "--enable-targets=all" "--enable-64-bit-bfd" + ] ++ lib.optional (!hostCpuOnly) "--enable-targets=all" ++ [ + "--enable-64-bit-bfd" "--disable-install-libbfd" "--disable-shared" "--enable-static" "--with-system-zlib" diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index d824e3d2870e..9ba9a904a987 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,20 +16,20 @@ buildGo120Module rec { pname = "evcc"; - version = "0.116.0"; + version = "0.116.2"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-YM6E1g6lrgDTMrfSRacbPM0yXPAgBzGvLHdyaqncuWc="; + hash = "sha256-SZwfXoIJRdkr0jQSizmXGOWZYteqa2IWrJNSTOQ3OQ8="; }; - vendorHash = "sha256-O13m6yQvPha1AToK3Y2naeA70BUx+WBv6D8YniMSk7s="; + vendorHash = "sha256-V0etgtYoU5a6OexoHmy4rKv2J9qvNlT57utJp1Nxyas="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-OqY1pAkr/0uRzD2/wLwNYCV6XQLRsG+Jc5ST+04NFuE="; + hash = "sha256-GmNyjXt5eskf59e9dt1OLB4gayBFbk/pG+7dJ5qoO+Q="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/text/ucg/default.nix b/pkgs/tools/text/ucg/default.nix index d19379477d6c..5ecb9c747c48 100644 --- a/pkgs/tools/text/ucg/default.nix +++ b/pkgs/tools/text/ucg/default.nix @@ -1,21 +1,24 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, pkg-config , autoreconfHook +, pkg-config , pcre }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ucg"; - version = "0.3.3+date=2019-02-25"; + version = "unstable-2022-09-03"; src = fetchFromGitHub { owner = "gvansickle"; - repo = pname; - rev = "c3a67632f1e3f332bfb102f0db167f34a2e42da7"; - sha256 = "sha256-/wU1PmI4ejlv7gZzZNasgROYXFiDiIxE9BFoCo6+G5Y="; + repo = "ucg"; + rev = "cbb185e8adad6546b7e1c5e9ca59a81f98dca49f"; + hash = "sha256-Osdyxp8DoEjcr2wQLCPqOQ2zQf/0JWYxaDpZB02ACWo="; }; + outputs = [ "out" "man" ]; + nativeBuildInputs = [ autoreconfHook pkg-config @@ -40,8 +43,8 @@ stdenv.mkDerivation rec { runHook postInstallCheck ''; - meta = with lib; { - homepage = "https://github.com/gvansickle/ucg/"; + meta = { + homepage = "https://gvansickle.github.io/ucg/"; description = "Grep-like tool for searching large bodies of source code"; longDescription = '' UniversalCodeGrep (ucg) is an extremely fast grep-like tool specialized @@ -49,10 +52,10 @@ stdenv.mkDerivation rec { command-line compatible with Ack, to some extent with ag, and where appropriate with grep. Search patterns are specified as PCRE regexes. ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; - broken = stdenv.isAarch64; # cpuid.h: no such file or directory + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + broken = stdenv.isAarch64 || stdenv.isDarwin; }; -} +}) # TODO: report upstream diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27b79680848f..23ce67e0f276 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8076,7 +8076,7 @@ with pkgs; robodoc = callPackage ../tools/text/robodoc { }; - ucg = callPackage ../tools/text/ucg { stdenv = gcc10StdenvCompat; }; + ucg = callPackage ../tools/text/ucg { }; grive2 = callPackage ../tools/filesystems/grive2 { }; @@ -19102,6 +19102,8 @@ with pkgs; guile = null; }; + gdbHostCpuOnly = gdb.override { hostCpuOnly = true; }; + gf = callPackage ../development/tools/misc/gf { }; java-language-server = callPackage ../development/tools/java/java-language-server { };