diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a514d31dc84c..4db1f6d80e0d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6355,6 +6355,16 @@ }]; name = "Ioannis Koutras"; }; + jonaenz = { + name = "Jona Enzinger"; + email = "5xt3zyy5l@mozmail.com"; + matrix = "@jona:matrix.jonaenz.de"; + github = "jonaenz"; + githubId = 57130301; + keys = [{ + fingerprint = "1CC5 B67C EB9A 13A5 EDF6 F10E 0B4A 3662 FC58 9202"; + }]; + }; jonafato = { email = "jon@jonafato.com"; github = "jonafato"; diff --git a/nixos/modules/services/hardware/kanata.nix b/nixos/modules/services/hardware/kanata.nix index ccba87531e66..ca4bb7a7f1f1 100644 --- a/nixos/modules/services/hardware/kanata.nix +++ b/nixos/modules/services/hardware/kanata.nix @@ -180,8 +180,8 @@ in package = mkOption { type = types.package; default = pkgs.kanata; - defaultText = lib.literalExpression "pkgs.kanata"; - example = lib.literalExpression "pkgs.kanata-with-cmd"; + defaultText = literalExpression "pkgs.kanata"; + example = literalExpression "pkgs.kanata-with-cmd"; description = mdDoc '' The kanata package to use. @@ -198,7 +198,7 @@ in }; }; - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { hardware.uinput.enable = true; systemd = { @@ -211,5 +211,5 @@ in }; }; - meta.maintainers = with lib.maintainers; [ linj ]; + meta.maintainers = with maintainers; [ linj ]; } diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index b286b1a64c3e..efd4d0af7605 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -254,6 +254,14 @@ in { ''; }; + fastcgiTimeout = mkOption { + type = types.int; + default = 120; + description = lib.mdDoc '' + FastCGI timeout for database connection in seconds. + ''; + }; + database = { createLocally = mkOption { @@ -1032,7 +1040,7 @@ in { fastcgi_pass unix:${fpm.socket}; fastcgi_intercept_errors on; fastcgi_request_buffering off; - fastcgi_read_timeout 120s; + fastcgi_read_timeout ${builtins.toString cfg.fastcgiTimeout}s; ''; }; "~ \\.(?:css|js|woff2?|svg|gif|map)$".extraConfig = '' diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index f39549db883d..9a4c635402d1 100755 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -167,7 +167,7 @@ sub get_active_units { # Takes the name of the unit as an argument and returns a bool whether the unit is active or not. sub unit_is_active { my ($unit_name) = @_; - my $units = busctl_call_systemd1_mgr("ListUnitsByNames", "as", 1, $unit_name)->{data}->[0]; + my $units = busctl_call_systemd1_mgr("ListUnitsByNames", "as", 1, , "--", $unit_name)->{data}->[0]; if (scalar(@{$units}) == 0) { return 0; } diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 0198866b6ff8..f891a2cb2f4c 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -214,6 +214,25 @@ in { systemd.services."escaped\\x2ddash".serviceConfig.X-Test = "test"; }; + unitStartingWithDash.configuration = { + systemd.services."-" = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${pkgs.coreutils}/bin/true"; + }; + }; + }; + + unitStartingWithDashModified.configuration = { + imports = [ unitStartingWithDash.configuration ]; + systemd.services."-" = { + reloadIfChanged = true; + serviceConfig.ExecReload = "${pkgs.coreutils}/bin/true"; + }; + }; + unitWithRequirement.configuration = { systemd.services.required-service = { wantedBy = [ "multi-user.target" ]; @@ -637,9 +656,27 @@ in { assert_contains(out, "\nstarting the following units: escaped\\x2ddash.service\n") assert_lacks(out, "the following new units were started:") + # Ensure units can start with a dash + out = switch_to_specialisation("${machine}", "unitStartingWithDash") + assert_contains(out, "stopping the following units: escaped\\x2ddash.service\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_contains(out, "the following new units were started: -.service\n") + + # The regression only occurs when reloading units + out = switch_to_specialisation("${machine}", "unitStartingWithDashModified") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_contains(out, "reloading the following units: -.service") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + # Ensure units that require changed units are properly reloaded out = switch_to_specialisation("${machine}", "unitWithRequirement") - assert_contains(out, "stopping the following units: escaped\\x2ddash.service\n") + assert_contains(out, "stopping the following units: -.service\n") assert_lacks(out, "NOT restarting the following changed units:") assert_lacks(out, "reloading the following units:") assert_lacks(out, "\nrestarting the following units:") diff --git a/pkgs/applications/accessibility/wvkbd/default.nix b/pkgs/applications/accessibility/wvkbd/default.nix index a593b0d2ea2b..7f3a1315873f 100644 --- a/pkgs/applications/accessibility/wvkbd/default.nix +++ b/pkgs/applications/accessibility/wvkbd/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "wvkbd"; - version = "0.7"; + version = "0.9"; src = fetchFromGitHub { owner = "jjsullivan5196"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5UV2PMrLXtF3AxjfPxxwFRkgVef+Ap8nG1v795o0bWE="; + sha256 = "sha256-Dcb1mnqvf2MvwljWuqMV/8AyF/aGMcDiz4cRQ9NAFtM="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/dexed/default.nix b/pkgs/applications/audio/dexed/default.nix new file mode 100644 index 000000000000..67d9a56a1d0c --- /dev/null +++ b/pkgs/applications/audio/dexed/default.nix @@ -0,0 +1,107 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, libX11 +, libXrandr +, libXinerama +, libXext +, libXcursor +, freetype +, alsa-lib +, libjack2 +, Cocoa +, WebKit +, MetalKit +, simd +, DiscRecording +, CoreAudioKit +}: + +stdenv.mkDerivation rec { + pname = "dexed"; + version = "unstable-2022-07-09"; + + src = fetchFromGitHub { + owner = "asb2m10"; + repo = "dexed"; + rev = "2c036316bcd512818aa9cc8129767ad9e0ec7132"; + fetchSubmodules = true; + sha256 = "sha256-6buvA72YRlGjHWLPEZMr45lYYG6ZY+IWmylcHruX27g="; + }; + + postPatch = '' + # needs special setup on Linux, dunno if it can work on Darwin + # https://github.com/NixOS/nixpkgs/issues/19098 + sed -i -e '/juce::juce_recommended_lto_flags/d' Source/CMakeLists.txt + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + libX11 + libXext + libXcursor + libXinerama + libXrandr + freetype + alsa-lib + libjack2 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Cocoa + WebKit + MetalKit + simd + DiscRecording + CoreAudioKit + ]; + + # JUCE insists on only dlopen'ing these + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux (toString [ + "-lX11" + "-lXext" + "-lXcursor" + "-lXinerama" + "-lXrandr" + "-ljack" + ]); + + installPhase = let + vst3Dir = if stdenv.hostPlatform.isDarwin then "$out/Library/Audio/Plug-Ins/VST3" else "$out/lib/vst3"; + # this one's a guess, don't know where ppl have agreed to put them yet + clapDir = if stdenv.hostPlatform.isDarwin then "$out/Library/Audio/Plug-Ins/CLAP" else "$out/lib/clap"; + auDir = "$out/Library/Audio/Plug-Ins/Components"; + in '' + runHook preInstall + + '' + (if stdenv.hostPlatform.isDarwin then '' + mkdir -p $out/{Applications,bin} + mv Source/Dexed_artefacts/Release/Standalone/Dexed.app $out/Applications/ + ln -s $out/{Applications/Dexed.app/Contents/MacOS,bin}/Dexed + '' else '' + install -Dm755 {Source/Dexed_artefacts/Release/Standalone,$out/bin}/Dexed + '') + '' + mkdir -p ${vst3Dir} ${clapDir} + mv Source/Dexed_artefacts/Release/VST3/* ${vst3Dir} + mv Source/Dexed_artefacts/Release/CLAP/* ${clapDir} + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p ${auDir} + mv Source/Dexed_artefacts/Release/AU/* ${auDir} + '' + '' + + runHook postInstall + ''; + + meta = with lib; { + description = "DX7 FM multi platform/multi format plugin"; + mainProgram = "Dexed"; + homepage = "https://asb2m10.github.io/dexed"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = with maintainers; [ OPNA2608 ]; + }; +} diff --git a/pkgs/applications/audio/spotify-qt/default.nix b/pkgs/applications/audio/spotify-qt/default.nix index 45ff1bebc79e..67edd91949c6 100644 --- a/pkgs/applications/audio/spotify-qt/default.nix +++ b/pkgs/applications/audio/spotify-qt/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "spotify-qt"; - version = "3.8"; + version = "3.9"; src = fetchFromGitHub { owner = "kraxarn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Rgtw+nrM8YUBHPIIe9zVhLij/ep07piPf/2MSmTVQKk="; + sha256 = "sha256-8rLpasgXiaL2KpGnYMQdNN2ayjcSkmz5hDkNBnKNWHk="; }; buildInputs = [ libxcb qtbase qtsvg ]; diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index fbd318cb4a12..3d34cd8a0602 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -46,9 +46,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "7.13"; + version = "7.15"; url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz"; - sha256 = "sha256-a/6+kz2qUJVprnmwv2ofG08H4b+K/Balm+4TdIuSymQ="; + sha256 = "sha256-0auKGarm/mwIM8PYgqMkSKv6SihZDxRulUUOufWPuRw="; inherit (stable) gecko32 gecko64 patches; mono = fetchurl rec { @@ -61,7 +61,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-U1awbhJRT3aAJstyEjv2Dp20FqyQ4ntnFFRYJb12C/U="; + sha256 = "sha256-JMig0EUgxdRwpeaxZcNQi+6xWHUg43bXB7jkm5skKC8="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index d672df00d79f..a6efda32d838 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -17,13 +17,13 @@ mkDerivation rec { pname = "CopyQ"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "sha256-2BWyLVxH50G+S/Hp8E5hWG64DcIamtZPGm0nSMwEhY4="; + hash = "sha256-0XCqSF1oc2B3FD5OmOxqgt9sqCIrzK0KjkntVFXlRWI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/surface-control/default.nix b/pkgs/applications/misc/surface-control/default.nix index d8708c5a3df1..edcbc20d13bc 100644 --- a/pkgs/applications/misc/surface-control/default.nix +++ b/pkgs/applications/misc/surface-control/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "surface-control"; - version = "0.4.1-2"; + version = "0.4.2-1"; src = fetchFromGitHub { owner = "linux-surface"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZgtEmjk1HwoKkyuOiMWalK5RPb3ML8HM/wwz8OM9HoI="; + sha256 = "sha256-tFGYIIlcJ4qF1t4Ej6WanjHtm8dSWtH38856uSTc7rU="; }; - cargoSha256 = "sha256-CsPyY/NA2+Lecemuor2nHd6yzf2PvMK7NZyvY3vewpI="; + cargoSha256 = "sha256-WwTM1DMTi5DKnkMERkW8H8T2OXlg+Tk6BupmwnOAK5I="; nativeBuildInputs = [ pkg-config installShellFiles ]; buildInputs = [ udev ]; diff --git a/pkgs/applications/misc/tdrop/default.nix b/pkgs/applications/misc/tdrop/default.nix index b6d115c8feb9..34c01a197591 100644 --- a/pkgs/applications/misc/tdrop/default.nix +++ b/pkgs/applications/misc/tdrop/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tdrop"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "noctuid"; repo = "tdrop"; rev = version; - sha256 = "sha256-1umHwzpv4J8rZ0c0q+2dPsEk4vhFB4UerwI8ctIJUZg="; + sha256 = "sha256-fHvGXaZL7MMvTnkap341B79PDDo2lOVPPcOH4AX/zXo="; }; dontBuild = true; diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index 4edc97a0640d..f2f850556849 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -34,11 +34,11 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "6.0.4"; + version = "6.0.6"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-qPGX4z0WeGieu/e8Gr6Ek0xGXSLFBMR8LH6bdKoELQ0="; + sha256 = "sha256-ABc2NPp2ruY244qQscAmFskD5CFzEH1HtBFJYLX76Dk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index 3958d2870942..f5ad715d87a6 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { pname = "skrooge"; - version = "2.27.0"; + version = "2.28.0"; src = fetchurl { url = "https://download.kde.org/stable/skrooge/${pname}-${version}.tar.xz"; - sha256 = "sha256-xkl0UyJEDOeYOqqXf3woCDMb8ZyC2c5ChQdDFFERZxE="; + sha256 = "sha256-s2SkGMBx7HVpr1NBUJpqji3PTPnw4RqnkakdQVC5ric="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/astronomy/siril/default.nix b/pkgs/applications/science/astronomy/siril/default.nix index 4a51e88dc3b9..a9980afdc44a 100644 --- a/pkgs/applications/science/astronomy/siril/default.nix +++ b/pkgs/applications/science/astronomy/siril/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "siril"; - version = "1.0.0"; + version = "1.0.3"; src = fetchFromGitLab { owner = "free-astro"; repo = pname; rev = version; - sha256 = "sha256-yqWFEa1fnSwl0ecN9hMI13QCfj0f69CFqTJlEAhTpJI="; + sha256 = "sha256-Y5ED2LuNapaq+FkKg3m8t4sgoh2TGXO1VX0p5gwlJjQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix index 8c2541fe4129..af1be978459c 100644 --- a/pkgs/applications/science/math/fricas/default.nix +++ b/pkgs/applications/science/math/fricas/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fricas"; - version = "1.3.7"; + version = "1.3.8"; src = fetchurl { url = "mirror://sourceforge/fricas/fricas/${version}/fricas-${version}-full.tar.bz2"; - sha256 = "sha256-cOqMvSe3ef/ZeVy5cj/VU/aTRtxgfxZfRbE4lWE5TU4="; + sha256 = "sha256-amAGPLQo70nKATyZM7h3yX5mMUxCwOFwb/fTIWB5hUQ="; }; buildInputs = [ sbcl libX11 libXpm libICE libSM libXt libXau libXdmcp ]; diff --git a/pkgs/applications/video/media-downloader/default.nix b/pkgs/applications/video/media-downloader/default.nix index 332f8ef78eea..e9f2f7781b3a 100644 --- a/pkgs/applications/video/media-downloader/default.nix +++ b/pkgs/applications/video/media-downloader/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "media-downloader"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = pname; rev = "${version}"; - sha256 = "sha256-EyfhomwBtdAt6HGRwnpiijm2D1LfaCAoG5qk3orDG98="; + sha256 = "sha256-xoRbNbzFa1CEB4x9JLkVMrkEqaCgweFzvI0Qr9Fl4zs="; }; nativeBuildInputs = [ cmake qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/window-managers/berry/default.nix b/pkgs/applications/window-managers/berry/default.nix index 5c2c7dcb5ce4..96054e86f505 100644 --- a/pkgs/applications/window-managers/berry/default.nix +++ b/pkgs/applications/window-managers/berry/default.nix @@ -39,6 +39,10 @@ stdenv.mkDerivation rec { freetype ]; + postPatch = '' + sed -i --regexp-extended 's/(pkg_verstr=").*(")/\1${version}\2/' configure + ''; + preConfigure = '' patchShebangs configure ''; diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index c89e140f94e5..2374d23c1d64 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -6,16 +6,16 @@ in rustPlatform.buildRustPackage rec { pname = "leftwm"; - version = "0.2.11"; + version = "0.3.0"; src = fetchFromGitHub { owner = "leftwm"; repo = "leftwm"; rev = version; - sha256 = "sha256-GLHmX628UUdIM+xYJhPtqFg4whQqaF8hFxg0Z5grPac="; + sha256 = "sha256-AfE36u5xSfivkg+hmJ6ASh6zXmTnLOv5RFigkGzySng="; }; - cargoSha256 = "sha256-4Pu3TDLmi0c2nyUj1lTRincgRqL40A/g0PkyJOen0is="; + cargoSha256 = "sha256-MmxF1jt5VUZGbkEe858HBjAuHhgDY23MJJxpYQ4ckhs="; buildInputs = rpathLibs; diff --git a/pkgs/development/beam-modules/erlfmt/default.nix b/pkgs/development/beam-modules/erlfmt/default.nix index da577f2264c0..f88ea619da31 100644 --- a/pkgs/development/beam-modules/erlfmt/default.nix +++ b/pkgs/development/beam-modules/erlfmt/default.nix @@ -2,12 +2,12 @@ rebar3Relx rec { pname = "erlfmt"; - version = "1.0.0"; + version = "1.1.0"; releaseType = "escript"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "erlfmt"; - sha256 = "19apbs9xr4j8qjb3sv9ilknqjw4a7bvp8jvwrjiwvwnxzzm2kjm6"; + sha256 = "sha256-diZCyw4eR+h/Pc73HDfnFaXnNXwqu3XabTbeiWVPNPI="; rev = "v${version}"; }; meta = with lib; { diff --git a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix index 8d8b4aa778fd..2d4fe974c016 100644 --- a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, llvm_meta, cmake, python3 -, monorepoSrc, runCommand +, monorepoSrc, runCommand, fetchpatch , cxx-headers, libunwind, version , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -39,7 +39,13 @@ stdenv.mkDerivation rec { patches = [ ./gnu-install-dirs.patch - ./skip-other-project-tests.patch + + # https://reviews.llvm.org/D132298, Allow building libcxxabi alone + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/e6a0800532bb409f6d1c62f3698bdd6994a877dc.patch"; + sha256 = "1xyjd56m4pfwq8p3xh6i8lhkk9kq15jaml7qbhxdf87z4jjkk63a"; + stripLen = 1; + }) ]; postPatch = '' diff --git a/pkgs/development/compilers/llvm/git/libcxxabi/skip-other-project-tests.patch b/pkgs/development/compilers/llvm/git/libcxxabi/skip-other-project-tests.patch deleted file mode 100644 index 760eeec9e16f..000000000000 --- a/pkgs/development/compilers/llvm/git/libcxxabi/skip-other-project-tests.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -131,10 +131,21 @@ if (NOT LIBCXXABI_ENABLE_SHARED AND NOT LIBCXXABI_ENABLE_STATIC) - message(FATAL_ERROR "libc++abi must be built as either a shared or static library.") - endif() - --# TODO: Remove this, which shouldn't be necessary since we know we're being built --# side-by-side with libc++. - set(LIBCXXABI_LIBCXX_INCLUDES "" CACHE PATH - "Specify path to libc++ includes.") -+if (NOT libcxx IN_LIST LLVM_ENABLE_RUNTIMES) -+ if (NOT IS_DIRECTORY ${LIBCXXABI_LIBCXX_INCLUDES}) -+ message(FATAL_ERROR -+ "LIBCXXABI_LIBCXX_INCLUDES=${LIBCXXABI_LIBCXX_INCLUDES} is not a valid directory. " -+ "Please provide the path to where the libc++ headers have been installed.") -+ endif() -+ add_library(cxx-headers INTERFACE) -+ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC" OR "${CMAKE_CXX_SIMULATE_ID}" STREQUAL "MSVC") -+ target_compile_options(cxx-headers INTERFACE /I "${LIBCXXABI_LIBCXX_INCLUDES}") -+ else() -+ target_compile_options(cxx-headers INTERFACE -I "${LIBCXXABI_LIBCXX_INCLUDES}") -+ endif() -+endif() - - set(LIBCXXABI_HERMETIC_STATIC_LIBRARY_DEFAULT OFF) - if (WIN32) ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -61,9 +61,13 @@ if (LIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY) - list(APPEND LIBCXXABI_TEST_DEPS cxx_external_threads) - endif() - --list(APPEND LIBCXXABI_TEST_DEPS cxx) --if (LIBCXXABI_USE_LLVM_UNWINDER AND TARGET unwind) -- list(APPEND LIBCXXABI_TEST_DEPS unwind) -+if(libcxx IN_LIST LLVM_ENABLE_RUNTIMES) -+ list(APPEND LIBCXXABI_TEST_DEPS cxx) -+endif() -+if(libunwind IN_LIST LLVM_ENABLE_RUNTIMES) -+ if (LIBCXXABI_USE_LLVM_UNWINDER AND TARGET unwind) -+ list(APPEND LIBCXXABI_TEST_DEPS unwind) -+ endif() - endif() - - set(AUTO_GEN_COMMENT "## Autogenerated by libcxxabi configuration.\n# Do not edit!") diff --git a/pkgs/development/compilers/tvm/default.nix b/pkgs/development/compilers/tvm/default.nix index c148e522015e..05d2f8696df2 100644 --- a/pkgs/development/compilers/tvm/default.nix +++ b/pkgs/development/compilers/tvm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "tvm"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "apache"; repo = "incubator-tvm"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-fv2hhPGbr/AbwuN8rAF9PI/QTTqxNgwjYl9arg5GjKY="; + sha256 = "sha256-lzLrd4vNK1c7BwWS0H5x1uDdZ3moUl+zWHb8G6gs8hw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/embedded/svdtools/default.nix b/pkgs/development/embedded/svdtools/default.nix index 7d5f62c55aa2..0400270f5df0 100644 --- a/pkgs/development/embedded/svdtools/default.nix +++ b/pkgs/development/embedded/svdtools/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svdtools"; - version = "0.2.5"; + version = "0.2.6"; src = fetchCrate { inherit version pname; - sha256 = "sha256-tN1GC4tQXyaA8bgq7wB/NZEdO14p/0f8BXtgTk6aOzg="; + sha256 = "sha256-y0RCUSk7YEE5bF/dVEuH/sTtHcVIT4+P0DVkPiNf54I="; }; - cargoSha256 = "sha256-puaveP9a11rlGgsguCfueYXfYSd7Xew8ZRGeDP8WrSI="; + cargoSha256 = "sha256-PPoHTh8cjQMkD69BYk/HW/PwDV5j/OrHHpjFZdBqZxM="; meta = with lib; { description = "Tools to handle vendor-supplied, often buggy SVD files"; diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index fd8fbd42caeb..a48c754c5b41 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2022.03"; + version = "2022.07"; src = fetchurl { url = "https://rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; - sha256 = "sha256-A+IVsAGoeXR2GNb8GOt/icC4EvXlQ6Q+1mwTQ56ooic="; + hash = "sha256-ejvJ1lTh0nkqBVtPrxFu820UH2tq3eeqcDF3BfJgkK0="; }; nativeBuildInputs = [ removeReferencesTo ]; diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index da7e66efff1b..7c8bedfd303f 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2022.03"; + version = "2022.07"; src = fetchurl { url = "https://moarvm.org/releases/MoarVM-${version}.tar.gz"; - sha256 = "sha256-+3HNE5EkZEgrmbM/DAbp/XxRoVHG5jKpIgz5PFhV/a8="; + hash = "sha256-M37wTRb4JvmUZcZTuSAGAo/iIL5o09z9BylhL09rW0Y="; }; patches = [ diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index dbcb945f4c34..44eb417e5260 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2022.03"; + version = "2022.07"; src = fetchurl { url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz"; - sha256 = "sha256-qV53iXDE0JwJHSqimcBQNiCM5LSw06evNzGYwSJYswY="; + hash = "sha256-WAgcEG1nKlQGAY/WmRLI1IX9Er8iWVEyXFDJKagjImg="; }; buildInputs = [ perl ]; diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 7a809875111f..56452c70b99c 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.13.7"; + version = "0.13.8"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-FEQwe9MkP+tFZgXiR3hrNS+Jyavj85oYql3uOLP3nwc="; + sha256 = "sha256-lWlom1LZuYzsV6BzOl232usvJJFlTz1DQOWkuNUTvX4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix index 3c145b3c1e38..fb44222e75f5 100644 --- a/pkgs/development/libraries/gmm/default.nix +++ b/pkgs/development/libraries/gmm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gmm"; - version = "5.4"; + version = "5.4.2"; src = fetchurl { url = "mirror://savannah/getfem/stable/${pname}-${version}.tar.gz"; - sha256 = "0mhygfpsdyr0d4h3sn6g7nxn149yrlqv7r2h34yqkrpv1q4daqvi"; + sha256 = "sha256-UgbnMmQ/aTQQkCiy8XNmDywu3LDuJpIo1pSsym4iyIo="; }; meta = with lib; { diff --git a/pkgs/development/libraries/libbde/default.nix b/pkgs/development/libraries/libbde/default.nix index ba44a200e83b..7134ddd3f746 100644 --- a/pkgs/development/libraries/libbde/default.nix +++ b/pkgs/development/libraries/libbde/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libbde"; - version = "20210605"; + version = "20220121"; src = fetchurl { url = "https://github.com/libyal/libbde/releases/download/${version}/${pname}-alpha-${version}.tar.gz"; - sha256 = "0dk5h7gvp2fgg21n7k600mnayg4g4pc0lm7317k43j1q0p4hkfng"; + sha256 = "sha256-dnSMuTm/nMiZ6t2rbhDqGpp/e9xt5Msz2In8eiuTjC8="; }; buildInputs = [ fuse ncurses python3 ]; diff --git a/pkgs/development/libraries/libinklevel/default.nix b/pkgs/development/libraries/libinklevel/default.nix index c5dc7987ca62..dffbcdd69d10 100644 --- a/pkgs/development/libraries/libinklevel/default.nix +++ b/pkgs/development/libraries/libinklevel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libinklevel"; - version = "0.9.3"; + version = "0.9.4"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1zwkicjznkzw81ax745inv4n29y20vq82w8249vizaal76739n19"; + sha256 = "sha256-J0cEaC5v4naO4GGUzdfV55kB7KzA+q+v64i5y5Xbp9Q="; }; buildInputs = [ diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix index 075f096486b4..ed862eaecfe3 100644 --- a/pkgs/development/libraries/minixml/default.nix +++ b/pkgs/development/libraries/minixml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mxml"; - version = "3.3"; + version = "3.3.1"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = "mxml"; rev = "v${version}"; - sha256 = "sha256-YN8g8KDk7xnDVK1io0zSLO7erxEp4VQ9heA7Lu/cUUg="; + sha256 = "sha256-l7GUA+vlSECi/72eU3Y9COpGtLTRh3vYcHUi+uRkCn8="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 325a6b82a6f9..4f895c851597 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -12,13 +12,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "ipopt"; - version = "3.14.5"; + version = "3.14.9"; src = fetchFromGitHub { owner = "coin-or"; repo = "Ipopt"; rev = "releases/${version}"; - sha256 = "sha256-eqOacZGuuGAjWMs2H6RntQ+WJmGTi+EqydHUQXEpY54="; + sha256 = "sha256-mlRr1BjkWiJZSgpxQIc0k1tXGewJkHwxf6xe0edUHaY="; }; CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index 6bb11139502f..9db6201c4786 100644 --- a/pkgs/development/libraries/sofia-sip/default.nix +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sofia-sip"; - version = "1.13.7"; + version = "1.13.8"; src = fetchFromGitHub { owner = "freeswitch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gBejwt5YAkCKQh0vzN00J4y1ifcdc4TglA+SqEevaGQ="; + sha256 = "sha256-RtYeZFQu0YvD709KNmwPPlOLMl01Ox58cpNYygvDn78="; }; buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration; diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix index f55f91d5a192..384aa6201a3d 100644 --- a/pkgs/development/python-modules/awesomeversion/default.nix +++ b/pkgs/development/python-modules/awesomeversion/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "awesomeversion"; - version = "22.6.0"; + version = "22.8.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-osAJzJr9PtGH8wcHam1BolIBTD8QDBWg3mI/z4JW0JE="; + sha256 = "sha256-peSGe9ycxVD2ve8tFpmznQZr3Hrc1KimeVlThmd0NFo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pep440/default.nix b/pkgs/development/python-modules/pep440/default.nix index 83187327af17..2bb4cdde5d20 100644 --- a/pkgs/development/python-modules/pep440/default.nix +++ b/pkgs/development/python-modules/pep440/default.nix @@ -1,20 +1,27 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "pep440"; - version = "0.1.0"; - format = "setuptools"; + version = "0.1.1"; + format = "flit"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "m1H/yqqDiFrj6tmD9jo8nDakCBZxkBPq/HtSOXMH4ZQ="; + hash = "sha256-E9F4mHaavQKK8PYnRcnOdfW7mXcBKn1dTInCknLeNO4="; }; + nativeBuildInputs = [ + flit-core + ]; + checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index 27c92786a1f8..bd03c8669225 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.1.2"; + version = "4.1.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KGPPnyjFbKmNdFosn+4WvQH1rxDsiOEH9qmb3Zq8Xb8="; + hash = "sha256-tZo8+McpnJ1gekghtgH6m5w7nmVWB8CTxz5RGHv3xtE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix index 5be2fca96fbe..602b0d86f44b 100644 --- a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix +++ b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "scheme-bytestructures"; - version = "1.0.10"; + version = "2.0.1"; src = fetchFromGitHub { owner = "TaylanUB"; repo = pname; rev = "v${version}"; - sha256 = "04oDvwvzTRzAVyywbcCm3Ug3p3xNbxjI7nOKYakEZZI="; + sha256 = "sha256-Wvs288K8BVjUuWvvzpDGBwOxL7mAXjVtgIwJAsQd0L4="; }; postConfigure = '' diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 68cf821b2b10..b69aa66948d8 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "9.1.4"; + version = "9.1.6"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-Hs9DZmgkaX00cI7YXTfgdvC0x3st8UfU0pQ7BDGHpDY="; + sha256 = "sha256-ZqvphqQsuLbc23TaMEIZvoghdZ2hA3GkJu40G6ykJXQ="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index 0c529800cce6..d05587c25546 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gosec"; - version = "2.13.0"; + version = "2.13.1"; src = fetchFromGitHub { owner = "securego"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U4nP812du71wcU/OPSDpZePHO9/vSdTL5s58VdA4UvY="; + sha256 = "sha256-a7SZe6n3MQIjkOtFPavFYmBadHwsShjWdzMzOGZIb9s="; }; vendorSha256 = "sha256-D4wWofYz63c0yXIg4xnolXzWudG17dRqdjUHYhMrtt4="; diff --git a/pkgs/development/tools/misc/gf/default.nix b/pkgs/development/tools/misc/gf/default.nix index f460b844ada0..d47a4ae2c241 100644 --- a/pkgs/development/tools/misc/gf/default.nix +++ b/pkgs/development/tools/misc/gf/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "gf"; - version = "unstable-2022-06-22"; + version = "unstable-2022-08-01"; src = fetchFromGitHub { repo = "gf"; owner = "nakst"; - rev = "e0d6d2f59344f853a4a204d5313db6b6a5e5de7d"; - sha256 = "01fln4wnn1caqr4wa1nhcp0rqdx5m5nqyn2amvclp5hhi3h3qaiq"; + rev = "c0a018a9b965eb97551ee87d5236a9f57011cea2"; + hash = "sha256-i0aLSy+4/fbYZpUKExFDUZ/2nXJmEhRsAX0JQZ8EhNk="; }; nativeBuildInputs = [ makeWrapper pkg-config ]; diff --git a/pkgs/development/tools/misc/pkgconf/default.nix b/pkgs/development/tools/misc/pkgconf/default.nix index e479f8a2db9f..7e7b60de295f 100644 --- a/pkgs/development/tools/misc/pkgconf/default.nix +++ b/pkgs/development/tools/misc/pkgconf/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "pkgconf"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-22v1Qm4On8EHBCzIX8YrHzkfHXr0bEo8Obf1tSMd+gk="; + hash = "sha256-X7NVtIfVT7bTQeTxjU4vfoE6ZiLPA6noev+mpAVlaZ0="; }; outputs = [ "out" "lib" "dev" "man" "doc" ]; diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix index 7f42c39cb218..fc2e21173bad 100644 --- a/pkgs/development/tools/profiling/heaptrack/default.nix +++ b/pkgs/development/tools/profiling/heaptrack/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "heaptrack"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "KDE"; repo = "heaptrack"; rev = "v${version}"; - sha256 = "sha256-GXwlauLspbY+h/Y75zlHPoP27pr3xVl05LuDW+WVYxU="; + sha256 = "sha256-AzHQnPYhmCHGco7JoKal57PC6NKUoMTeflHtFsBxQpA="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/development/tools/snazy/default.nix b/pkgs/development/tools/snazy/default.nix index b909d0e128d6..59a691a50a81 100644 --- a/pkgs/development/tools/snazy/default.nix +++ b/pkgs/development/tools/snazy/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "snazy"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "chmouel"; repo = pname; rev = version; - sha256 = "sha256-0LxpwvQxHxNQ09kCsM8fJfcOxPMKqzQlW1Kl2y0I3Zg="; + sha256 = "sha256-kUoML6UUgZLOBCbakj1CJeRSt268rv2ymAdvPkcn8R4="; }; - cargoSha256 = "sha256-onYVVBB91Zn+WcELpBhybT3hV1gZMXHXbmScA6a1mys="; + cargoSha256 = "sha256-MPfzC5iEE8GficLUaGaBy5usZzYoreYsdadoiiRoVQI="; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix index 65c889aee832..2e54aeb3046d 100644 --- a/pkgs/development/tools/the-way/default.nix +++ b/pkgs/development/tools/the-way/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "the-way"; - version = "0.13.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "out-of-cheese-error"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OqJceRO1RFOLgNi3SbTKLw62tSfJSO7T2/u0RTX89AM="; + sha256 = "sha256-Imo1CUk2H4/K9w/FnIBEkKFXd7OIAuApejcNY+rs7JU="; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ AppKit Security ]; - cargoSha256 = "sha256-sULjd+weixTQYFIQlluPwY4MFlZ1+vMMoMn4GP79oQs="; + cargoSha256 = "sha256-3ZiNRXrb3gpXXOxztf0eimJE16PpQTD/OWFmeTDIr2w="; checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=copy" ]; dontUseCargoParallelTests = true; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 6b154210d89f..2e4dccbed2da 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.374"; + version = "0.0.377"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-rudTGh4l0wroag0yp2YU8h5NTq+noC3bjbisyP47ktI="; + sha256 = "sha256-L8wOhs7jL+nby2NTPQGweGTKBYnXFKnfi7boFBOeSTs="; }; vendorSha256 = "sha256-E6QeWu88MXMMfZAM7vMIGXpJQuduX6GTj3tXvlE9hFo="; diff --git a/pkgs/servers/monitoring/prometheus/speedtest-exporter.nix b/pkgs/servers/monitoring/prometheus/speedtest-exporter.nix new file mode 100644 index 000000000000..04f6581338ca --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/speedtest-exporter.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub }: +let + pname = "speedtest_exporter"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "nlamirault"; + repo = "speedtest_exporter"; + rev = "7364db62b98ab2736405c7cde960698ab5b688bf"; + sha256 = "WIMDv63sHyZVw3Ct5LFXCIufj7sU2H81n+hT/NiPMeQ="; + }; + +in buildGoModule rec { + inherit pname version src; + + vendorSha256 = "Lm73pZzdNZv7J+vKrtQXxm4HiAuB9lugKT/oanmD0HM="; + + meta = with lib; { + license = licenses.asl20; + homepage = "https://github.com/nlamirault/speedtest_exporter"; + description = "Prometheus exporter for Speedtest metrics"; + maintainers = with maintainers; [ jonaenz ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/nosql/influxdb2/cli.nix b/pkgs/servers/nosql/influxdb2/cli.nix index 573835a2dd83..a949ebee89a7 100644 --- a/pkgs/servers/nosql/influxdb2/cli.nix +++ b/pkgs/servers/nosql/influxdb2/cli.nix @@ -5,13 +5,13 @@ }: let - version = "2.2.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = "influxdata"; repo = "influx-cli"; rev = "v${version}"; - sha256 = "sha256-9FUchI93xLpQwtpbr5S3GfVrApHaemwbnRPIfAWmG6Y="; + sha256 = "sha256-i3PN0mvSzPX/hu6fF2oizfioHZ2qU2V+mRwuxT1AYWo="; }; in buildGoModule { diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index f144348744a9..16502571375a 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "pgpool-II"; - version = "4.3.2"; + version = "4.3.3"; src = fetchurl { name = "${pname}-${version}.tar.gz"; url = "http://www.pgpool.net/download.php?f=${pname}-${version}.tar.gz"; - sha256 = "02jg0c6k259i0r927dng9h0y58q965swshg2c9mzqhazcdiga5ap"; + sha256 = "sha256-bHNDS67lgThqlVX+WWKL9GeCD31b2+M0F2g5mgOCyXk="; }; buildInputs = [ postgresql openssl pam libmemcached ]; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "http://pgpool.net/mediawiki/index.php"; description = "A middleware that works between postgresql servers and postgresql clients"; license = licenses.free; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/web-apps/shiori/default.nix b/pkgs/servers/web-apps/shiori/default.nix index cbfa28b8f46d..5d138132377e 100644 --- a/pkgs/servers/web-apps/shiori/default.nix +++ b/pkgs/servers/web-apps/shiori/default.nix @@ -2,9 +2,9 @@ buildGoModule rec { pname = "shiori"; - version = "1.5.2"; + version = "1.5.3"; - vendorSha256 = "sha256-6XF4wBwoRnINAskhGHTw4eAJ9zAaoZcEYo9/xZk4ems="; + vendorSha256 = "sha256-vyBb8jNpXgpiktbn2lphL2wAeKmvjJLxV8ZrHoUSNYY="; doCheck = false; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "go-shiori"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Py6Lq29F7RkvSui+Z2VyogU9+azHQ2KEvEq924pQmQo="; + sha256 = "sha256-razBb/flqwyFG4SPWhSapDO1sB5DYzyjYGx8ABFg/I8="; }; passthru.tests = { diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/tools/networking/termshark/default.nix index 3f09df815a7b..0aa01f69bd60 100644 --- a/pkgs/tools/networking/termshark/default.nix +++ b/pkgs/tools/networking/termshark/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "termshark"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "gcla"; repo = "termshark"; rev = "v${version}"; - sha256 = "sha256-ekIxKBnqGTIXncvSTItBL43WN5mdX5dxROWHXUtH3o8="; + sha256 = "sha256-qq7BDGprRkWKRMJiVnqPeTwtHd3tea9dPE8RIPL2YVI="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ wireshark-cli ]; - vendorSha256 = "sha256-16JPVgo3heJMjOHNOP13kyhRveQjF9h9kRznhSZM+ik="; + vendorSha256 = "sha256-C9XOiNjo+TZ+erdnypRhhfpbuBhB3yEqNpbtwjEv14g="; doCheck = false; diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/tools/networking/tinyproxy/default.nix index b382aeaf7428..aff04299953b 100644 --- a/pkgs/tools/networking/tinyproxy/default.nix +++ b/pkgs/tools/networking/tinyproxy/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "tinyproxy"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { - sha256 = "13fhkmmrwzl657dq04x2wagkpjwdrzhkl141qvzr7y7sli8j0w1n"; + sha256 = "sha256-tipFXh9VG5auWTI2/IC5rwMQFls7aZr6dkzhYTZZkXM="; rev = version; repo = "tinyproxy"; owner = "tinyproxy"; diff --git a/pkgs/tools/security/mitmproxy2swagger/default.nix b/pkgs/tools/security/mitmproxy2swagger/default.nix index bdd189b479a1..1ff200063f54 100644 --- a/pkgs/tools/security/mitmproxy2swagger/default.nix +++ b/pkgs/tools/security/mitmproxy2swagger/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "mitmproxy2swagger"; - version = "0.6.1"; + version = "0.7.0"; format = "pyproject"; src = fetchFromGitHub { owner = "alufers"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7c+SIU5re1GaqKmzjY+wBXwm8CoQ4uaNLNHzUfG0GDA="; + hash = "sha256-tLLz3nGIzsE6bkHbMC+Cfevv7E/NNHxtYqCUwo/5yF4="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 296845c644d1..d732ae9a07c6 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.34.0"; + version = "2.36.0"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "sha256-JRJjuVF0MkV7KVmbAZhiWPWVwDORByCsZqPwdTuVRoA="; + sha256 = "sha256-Mux0n8uBnh9R+llA/XAVsfcDWIDxoaQkkSuhoSpIhl4="; }; - vendorSha256 = "sha256-/N/RYqt+lhhECK+uq99vkm3Mg7PWpdE0GYLXkIYthNw="; + vendorSha256 = "sha256-cxfanKv25U8U6FQ1YfOXghAR8GYQB9PN0TkfLzG4UbI="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/pkgs/tools/system/kanata/default.nix b/pkgs/tools/system/kanata/default.nix index 08023b0e0326..e83542071e73 100644 --- a/pkgs/tools/system/kanata/default.nix +++ b/pkgs/tools/system/kanata/default.nix @@ -1,41 +1,26 @@ { fetchFromGitHub -, fetchpatch , lib -, libevdev -, pkg-config , rustPlatform , withCmd ? false }: rustPlatform.buildRustPackage rec { pname = "kanata"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "jtroo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0S27dOwtHxQi5ERno040RWZNo5+ao0ULFwHKJz27wWw="; + sha256 = "sha256-2gGFAz0zXea+27T4ayDj6KdoI0ThwXV7U0CspHduTiQ="; }; - cargoHash = "sha256-Ge9CiYIl6R8cjfUAY4B9ggjNZv5vpjmQKMPv93wGJwc="; - - cargoPatches = [ - (fetchpatch { - name = "update-cargo.lock-for-1.0.6.patch"; - url = "https://github.com/jtroo/kanata/commit/29a7669ac230571c30c9113e5c82e8440c8b89af.patch"; - sha256 = "sha256-s4R7vUFlrL1XTNpgXRyIpIq4rDuM5A85ECzbMUX4MAw="; - }) - ]; + cargoHash = "sha256-0NvZATdPABIboL5xvmBmDbqPPWvO4mM6wVB3FrOVHIQ="; buildFeatures = lib.optional withCmd "cmd"; - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ libevdev ]; - meta = with lib; { - description = "A cross-platform advanced keyboard customization tool"; + description = "A tool to improve keyboard comfort and usability with advanced customization"; homepage = "https://github.com/jtroo/kanata"; license = licenses.lgpl3Only; maintainers = with maintainers; [ linj ]; diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index 96fa0c19df3e..71c52b739184 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "thermald"; - version = "2.4.9"; + version = "2.5"; outputs = [ "out" "devdoc" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "sha256-82O4vrUo3lMNzGOI5WyV1eponF0za0WM6mtd54xqUh8="; + sha256 = "sha256-j66uBbTZhHFXhDSDI0IseoyF/rCEl/B87YjorfZIHX8="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/wayland/sov/default.nix b/pkgs/tools/wayland/sov/default.nix index a9b39e186b73..5d33e36db670 100644 --- a/pkgs/tools/wayland/sov/default.nix +++ b/pkgs/tools/wayland/sov/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "sov"; - version = "0.71"; + version = "0.72"; src = fetchFromGitHub { owner = "milgra"; repo = pname; rev = version; - sha256 = "sha256-6FdZ3UToeIAARxrOqSWBX+ALrlr4s2J0bj9c3l9ZTyQ="; + sha256 = "sha256-av+st0tux+ho8bfJwx6Nk1pma1Pjvv/dpW5BWnUDNvQ="; }; postPatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6890693faa0..dfea1b300e78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15169,6 +15169,8 @@ with pkgs; inherit (darwin) libobjc; }; defaultGemConfig = callPackage ../development/ruby-modules/gem-config { + # recent v8 doesn't build on nixpkgs Darwin yet. https://github.com/NixOS/nixpkgs/issues/158076 + v8 = if stdenv.isDarwin then v8_8_x else v8; inherit (darwin) DarwinTools cctools; inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -23244,6 +23246,7 @@ with pkgs; prometheus-smartctl-exporter = callPackage ../servers/monitoring/prometheus/smartctl-exporter { }; prometheus-smokeping-prober = callPackage ../servers/monitoring/prometheus/smokeping-prober.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; + prometheus-speedtest-exporter = callPackage ../servers/monitoring/prometheus/speedtest-exporter.nix { }; prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { }; prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { }; prometheus-sql-exporter = callPackage ../servers/monitoring/prometheus/sql-exporter.nix { }; @@ -26833,6 +26836,11 @@ with pkgs; denemo = callPackage ../applications/audio/denemo { }; + dexed = darwin.apple_sdk_11_0.callPackage ../applications/audio/dexed { + inherit (darwin.apple_sdk_11_0.frameworks) Cocoa WebKit MetalKit DiscRecording CoreAudioKit; + inherit (darwin.apple_sdk_11_0.libs) simd; + }; + dvdauthor = callPackage ../applications/video/dvdauthor { }; dvdbackup = callPackage ../applications/video/dvdbackup { };