From 97faf3a16d67dca8526e78a270429329e8b46528 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 3 May 2024 22:49:20 -0400 Subject: [PATCH 01/39] edge-runtime: remove comment incorrectly indicating auto-generated As far as I can tell, this is not auto-generated here, and was copied from `deno/librusty_v8.nix` without also copying its updateScript. --- pkgs/development/web/edge-runtime/librusty_v8.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/web/edge-runtime/librusty_v8.nix b/pkgs/development/web/edge-runtime/librusty_v8.nix index 1e0a306c13b6..1d5e334f2d07 100644 --- a/pkgs/development/web/edge-runtime/librusty_v8.nix +++ b/pkgs/development/web/edge-runtime/librusty_v8.nix @@ -1,4 +1,3 @@ -# auto-generated file -- DO NOT EDIT! { stdenv, fetchurl }: let From 5e9508802dd7572031c7aa892c643ff596a2a408 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 3 May 2024 22:50:59 -0400 Subject: [PATCH 02/39] treewide: mark librusty_v8 as binaryNativeCode As it is. --- pkgs/by-name/wi/windmill/package.nix | 5 ++++- pkgs/development/web/deno/librusty_v8.nix | 7 +++++-- pkgs/development/web/deno/update/librusty_v8.ts | 7 +++++-- pkgs/development/web/edge-runtime/librusty_v8.nix | 7 +++++-- pkgs/servers/http/router/librusty_v8.nix | 7 +++++-- 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/wi/windmill/package.nix b/pkgs/by-name/wi/windmill/package.nix index 709e7d07e9fc..be7cf8ef3391 100644 --- a/pkgs/by-name/wi/windmill/package.nix +++ b/pkgs/by-name/wi/windmill/package.nix @@ -74,7 +74,10 @@ rustPlatform.buildRustPackage { name = "librusty_v8-${args.version}"; url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a"; sha256 = args.shas.${stdenv.hostPlatform.system} or (throw "Unsupported platform ${stdenv.hostPlatform.system}"); - meta = { inherit (args) version; }; + meta = { + inherit (args) version; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; }; in fetch_librusty_v8 { diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index c4b2d814ef30..c6a22105d437 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -1,12 +1,15 @@ # auto-generated file -- DO NOT EDIT! -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let fetch_librusty_v8 = args: fetchurl { name = "librusty_v8-${args.version}"; url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a.gz"; sha256 = args.shas.${stdenv.hostPlatform.system}; - meta = { inherit (args) version; }; + meta = { + inherit (args) version; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; }; in fetch_librusty_v8 { diff --git a/pkgs/development/web/deno/update/librusty_v8.ts b/pkgs/development/web/deno/update/librusty_v8.ts index 14d698a063e7..301af63cb99b 100644 --- a/pkgs/development/web/deno/update/librusty_v8.ts +++ b/pkgs/development/web/deno/update/librusty_v8.ts @@ -40,14 +40,17 @@ fetchurl { const templateDeps = (version: string, deps: PrefetchResult[]) => `# auto-generated file -- DO NOT EDIT! -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let fetch_librusty_v8 = args: fetchurl { name = "librusty_v8-\${args.version}"; url = "https://github.com/denoland/rusty_v8/releases/download/v\${args.version}/librusty_v8_release_\${stdenv.hostPlatform.rust.rustcTarget}.a.gz"; sha256 = args.shas.\${stdenv.hostPlatform.system}; - meta = { inherit (args) version; }; + meta = { + inherit (args) version; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; }; in fetch_librusty_v8 { diff --git a/pkgs/development/web/edge-runtime/librusty_v8.nix b/pkgs/development/web/edge-runtime/librusty_v8.nix index 1d5e334f2d07..82cdb5e1575e 100644 --- a/pkgs/development/web/edge-runtime/librusty_v8.nix +++ b/pkgs/development/web/edge-runtime/librusty_v8.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let fetch_librusty_v8 = args: fetchurl { name = "librusty_v8-${args.version}"; url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a"; sha256 = args.shas.${stdenv.hostPlatform.system}; - meta = { inherit (args) version; }; + meta = { + inherit (args) version; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; }; in fetch_librusty_v8 { diff --git a/pkgs/servers/http/router/librusty_v8.nix b/pkgs/servers/http/router/librusty_v8.nix index 1d5e334f2d07..82cdb5e1575e 100644 --- a/pkgs/servers/http/router/librusty_v8.nix +++ b/pkgs/servers/http/router/librusty_v8.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let fetch_librusty_v8 = args: fetchurl { name = "librusty_v8-${args.version}"; url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a"; sha256 = args.shas.${stdenv.hostPlatform.system}; - meta = { inherit (args) version; }; + meta = { + inherit (args) version; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; }; in fetch_librusty_v8 { From 705099d123339e2cc874344beb4b85deb84e096a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 03:19:42 +0000 Subject: [PATCH 03/39] python311Packages.patiencediff: 0.2.14 -> 0.2.15 --- pkgs/development/python-modules/patiencediff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/patiencediff/default.nix b/pkgs/development/python-modules/patiencediff/default.nix index d75854a5cfeb..0ce5202db85d 100644 --- a/pkgs/development/python-modules/patiencediff/default.nix +++ b/pkgs/development/python-modules/patiencediff/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "patiencediff"; - version = "0.2.14"; + version = "0.2.15"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "breezy-team"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KTOESjaj8fMxJZ7URqg6UMpiQppqZAlk4IPWEw4/Nvw="; + hash = "sha256-SFu1oN1yE9tKeBgWhgWjDpR31AptGrls0D5kKQed+HI="; }; nativeBuildInputs = [ From 3a8211a3aeef52ac68b480cf1905fe851f029602 Mon Sep 17 00:00:00 2001 From: Nicolas Froger Date: Fri, 31 May 2024 23:45:26 +0200 Subject: [PATCH 04/39] dlib: 19.24.2 -> 19.24.4 Signed-off-by: Nicolas Froger --- pkgs/development/libraries/dlib/default.nix | 4 ++-- pkgs/development/python-modules/dlib/build-cores.patch | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index e433ec46a302..0d498ec8b8ba 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -18,13 +18,13 @@ }@inputs: (if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv).mkDerivation rec { pname = "dlib"; - version = "19.24.2"; + version = "19.24.4"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; rev = "v${version}"; - sha256 = "sha256-Z1fScuaIHjj2L1uqLIvsZ7ARKNjM+iaA8SAtWUTPFZk="; + sha256 = "sha256-1A/9u+ThtUtmmSwnFSn8S65Yavucl2X+o3bNYgew0Oc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/dlib/build-cores.patch b/pkgs/development/python-modules/dlib/build-cores.patch index eebc69a330fa..072519975c43 100644 --- a/pkgs/development/python-modules/dlib/build-cores.patch +++ b/pkgs/development/python-modules/dlib/build-cores.patch @@ -1,15 +1,17 @@ diff --git a/setup.py b/setup.py -index 0c8d8f16..565ef8ef 100644 +index 219583b..3ca5f88 100644 --- a/setup.py +++ b/setup.py -@@ -172,21 +172,7 @@ class CMakeBuild(build_ext): +@@ -170,23 +170,7 @@ class CMakeBuild(build_ext): subprocess.check_call(cmake_build, cwd=build_folder) def num_available_cpu_cores(ram_per_build_process_in_gb): - if 'TRAVIS' in os.environ and os.environ['TRAVIS']=='true': - # When building on travis-ci, just use 2 cores since travis-ci limits - # you to that regardless of what the hardware might suggest. -- return 2 +- return 2 +- elif 'CMAKE_BUILD_PARALLEL_LEVEL' in os.environ and os.environ['CMAKE_BUILD_PARALLEL_LEVEL'].isnumeric(): +- return int(os.environ['CMAKE_BUILD_PARALLEL_LEVEL']) - try: - mem_bytes = os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES') - mem_gib = mem_bytes/(1024.**3) From 03c93ec4ed5bbba6e87e024d7981e6394fde76b3 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 3 Jun 2024 07:42:44 +0100 Subject: [PATCH 05/39] mtools: 4.0.43 -> 4.0.44 Changes: https://lists.gnu.org/archive/html/info-gnu/2024-06/msg00000.html --- pkgs/tools/filesystems/mtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index 9045699e2e32..ef5eafc40508 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mtools"; - version = "4.0.43"; + version = "4.0.44"; src = fetchurl { url = "mirror://gnu/mtools/${pname}-${version}.tar.bz2"; - sha256 = "sha256-VB4XlmXcTicrlgLyB0JDWRoVfaicxHBk2oxYKdvSszk="; + hash = "sha256-N9xN8CJTPD1LLsHHiXPCfH6LWFN0wtRqtkxqPbMe3bg="; }; patches = lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; From f06f376b65ece8752e7192db8bf87705cc239139 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 3 Jun 2024 21:58:23 -0400 Subject: [PATCH 06/39] bitwarden-desktop: 2024.4.1 -> 2024.5.0 Diff: https://github.com/bitwarden/clients/compare/desktop-v2024.4.1...desktop-v2024.5.0 Changelog: https://github.com/bitwarden/clients/releases/tag/desktop-v2024.5.0 --- pkgs/by-name/bi/bitwarden-desktop/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index af391a5897d1..9ae3e52f3b94 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -29,13 +29,13 @@ let electron = electron_28; in buildNpmPackage rec { pname = "bitwarden-desktop"; - version = "2024.4.1"; + version = "2024.5.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-UzVzo8tq719W2EwUE4NfvUrqhb61fvd60EGkavQmv3Q="; + hash = "sha256-ozR46snGD5yl98FslmnTeQmd2on/0bQPEnqJ0t8wx70="; }; patches = [ @@ -60,7 +60,7 @@ in buildNpmPackage rec { makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-qkg1psct/ekIXB6QmJX1n/UOKUhYSD9Su7t/b4/4miM="; + npmDepsHash = "sha256-gprJGOE/uSSM3NHpcbelB7sueObEl4o522WRHIRFmwo="; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; @@ -76,7 +76,7 @@ in buildNpmPackage rec { patches; patchFlags = [ "-p4" ]; sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-lvEJmjzhpMhm+9INYHWpdltinUOI3DMtFN/ddDQrUvo="; + hash = "sha256-FA7B+bipYSxwIGvn/v9+wG3Km6lrwV58LbxsMlDK8q0="; }; cargoRoot = "apps/desktop/desktop_native"; From 12bd55a1a346d773224e318a225c62f7f50aa3ee Mon Sep 17 00:00:00 2001 From: Stu Small Date: Sat, 8 Jun 2024 12:54:56 -0600 Subject: [PATCH 07/39] nixos/power-profiles-daemon: Add assertion with auto-cpufreq auto-cpufreq is similar to tlp in that it shouldn't be run with power-profiles-daemon. There functionality can conflict and bugs can show up. On my system this materialized by auto-cpufreq frequently shutting down, but there may be other consequences. This change follows the same pattern as the tlp assertion --- nixos/modules/services/hardware/power-profiles-daemon.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/services/hardware/power-profiles-daemon.nix b/nixos/modules/services/hardware/power-profiles-daemon.nix index 05e5b7a00b42..7651c65b9f18 100644 --- a/nixos/modules/services/hardware/power-profiles-daemon.nix +++ b/nixos/modules/services/hardware/power-profiles-daemon.nix @@ -39,6 +39,12 @@ in which conflicts with services.tlp.enable = true; ''; } + { assertion = !config.services.auto-cpufreq.enable; + message = '' + You have set services.power-profiles-daemon.enable = true; + which conflicts with services.auto-cpufreq.enable = true; + ''; + } ]; environment.systemPackages = [ cfg.package ]; From 9c3a202dc234a40332a146ea1e98326f8c8eb4ab Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 10 Jun 2024 00:17:08 +0200 Subject: [PATCH 08/39] python311Packages.pygame-gui: 0610 -> 0611 --- pkgs/development/python-modules/pygame-gui/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygame-gui/default.nix b/pkgs/development/python-modules/pygame-gui/default.nix index c4e44398a09b..e370c36bb4d7 100644 --- a/pkgs/development/python-modules/pygame-gui/default.nix +++ b/pkgs/development/python-modules/pygame-gui/default.nix @@ -2,6 +2,7 @@ lib, pkgs, buildPythonPackage, + nix-update-script, fetchFromGitHub, setuptools, pygame-ce, @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "pygame-gui"; - version = "0610"; + version = "0611"; pyproject = true; # nixpkgs-update: no auto update @@ -19,7 +20,7 @@ buildPythonPackage rec { owner = "MyreMylar"; repo = "pygame_gui"; rev = "refs/tags/v_${version}"; - hash = "sha256-PVNi/I174AyEEjc+N2UGtgOYSGAgVQbqrKkWZnjOxFY="; + hash = "sha256-bibw6RUQKsOsaISunVEdQCT39KnXJ2VKVrAqsPS+Lu8="; }; nativeBuildInputs = [ setuptools ]; @@ -56,6 +57,10 @@ buildPythonPackage rec { disabledTestPaths = [ "tests/test_performance/test_text_performance.py" ]; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex" "v_(.*)" ]; + }; + meta = with lib; { description = "GUI system for pygame"; homepage = "https://github.com/MyreMylar/pygame_gui"; From 14f649e89344452beeea545d43957df21c447a37 Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Mon, 10 Jun 2024 18:22:23 +0200 Subject: [PATCH 09/39] dovecot_exporter: migrate to buildGoModule Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com> --- pkgs/by-name/do/dovecot_exporter/package.nix | 38 +++++++ .../prometheus/dovecot-exporter-deps.nix | 102 ------------------ .../prometheus/dovecot-exporter.nix | 27 ----- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 5 files changed, 39 insertions(+), 130 deletions(-) create mode 100644 pkgs/by-name/do/dovecot_exporter/package.nix delete mode 100644 pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix delete mode 100644 pkgs/servers/monitoring/prometheus/dovecot-exporter.nix diff --git a/pkgs/by-name/do/dovecot_exporter/package.nix b/pkgs/by-name/do/dovecot_exporter/package.nix new file mode 100644 index 000000000000..88a5eb11c024 --- /dev/null +++ b/pkgs/by-name/do/dovecot_exporter/package.nix @@ -0,0 +1,38 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, fetchpatch +, nixosTests +}: +buildGoModule rec { + pname = "dovecot_exporter"; + version = "0.1.3-unstable-2019-07-19"; + + src = fetchFromGitHub { + owner = "kumina"; + repo = "dovecot_exporter"; + rev = "7ef79118ba619ff078594837377189477a4d059f"; + sha256 = "sha256-qJbIBSfHYgFztuivuNjleDa+Bx0KC4OklCh3IvK2XFI="; + }; + + vendorHash = "sha256-+B8sROL1h6ElBfAUBT286yJF9m9zoRvMOrf0z2SVCj0="; + + patches = [ + # Migrate the project to Go modules + # https://github.com/kumina/dovecot_exporter/pull/23 + (fetchpatch { + url = "https://github.com/kumina/dovecot_exporter/commit/b5184dd99cf8c79facf20cea281828d302327665.patch"; + sha256 = "sha256-OcdI1fJ/wumDI/wk5PQVot9+Gw/PnsiwgJY7dcRyEsc="; + }) + ]; + + passthru.tests = { inherit (nixosTests.prometheus-exporters) dovecot; }; + + meta = { + inherit (src.meta) homepage; + description = "Prometheus metrics exporter for Dovecot"; + mainProgram = "dovecot_exporter"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ willibutz globin ]; + }; +} diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix deleted file mode 100644 index d94aad821485..000000000000 --- a/pkgs/servers/monitoring/prometheus/dovecot-exporter-deps.nix +++ /dev/null @@ -1,102 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3a771d992973f24aa725d07868b467d1ddfceafb"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "4aa4cc277ae58d2fab6cfe51dd17df5dceaf457d"; - sha256 = "009z6rpivyakgsxs0zkm94c9i7l65hcw2ljvah94wq3y6v6j47gs"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "0f2620f554cf5c8e281a2eb655a035f5a0f6dc90"; - sha256 = "0lxngq1a8cnsy6dlr6gi8pjv3fir2wiw76qh075pa9g02h7ywhv3"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "b5bfa0eb2c8d46bd91dc58271e973c5f0bbebcfa"; - sha256 = "1msxzkdgi0ing4ddmp0s4qrf267n6ylafw9mbz5yrr7spb1dgxgk"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f"; - sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "c7de2306084e37d54b8be01f3541a8464345e9a5"; - sha256 = "11dqfm2d0m4sjjgyrnayman96g59x2apmvvqby9qmww2qj2k83ig"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "05ee40e3a273f7245e8777337fc7b46e533a9a92"; - sha256 = "0f6fnczxa42b9rys2h3l0m8fy3x5hrhaq707vq0lbx5fcylw8lis"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } -] diff --git a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix b/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix deleted file mode 100644 index 7041c9df29d4..000000000000 --- a/pkgs/servers/monitoring/prometheus/dovecot-exporter.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: - -buildGoPackage rec { - pname = "dovecot_exporter"; - version = "0.1.3"; - - goPackagePath = "github.com/kumina/dovecot_exporter"; - - src = fetchFromGitHub { - owner = "kumina"; - repo = "dovecot_exporter"; - rev = version; - sha256 = "1lnxnnm45fhcyv40arcvpiiibwdnxdwhkf8sbjpifx1wspvphcj9"; - }; - - goDeps = ./dovecot-exporter-deps.nix; - - passthru.tests = { inherit (nixosTests.prometheus-exporters) dovecot; }; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Prometheus metrics exporter for Dovecot"; - mainProgram = "dovecot_exporter"; - license = licenses.asl20; - maintainers = with maintainers; [ willibutz globin ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cbb5d593f1ae..42977a2ab5d7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1065,6 +1065,7 @@ mapAliases ({ probe-rs-cli = throw "probe-rs-cli is now part of the probe-rs package"; # Added 2023-07-03 processing3 = throw "'processing3' has been renamed to/replaced by 'processing'"; # Converted to throw 2023-09-10 prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31 + prometheus-dovecot-exporter = dovecot_exporter; # Added 2024-06-10 prometheus-openvpn-exporter = throw "'prometheus-openvpn-exporter' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-12-23 prometheus-speedtest-exporter = throw "prometheus-speedtest-exporter was removed as unmaintained"; # Added 2023-07-31 protobuf3_17 = throw "protobuf3_17 does not receive updates anymore and has been removed"; # Added 2023-05-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 169e0f6bc72c..afdc0f604b9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26342,7 +26342,6 @@ with pkgs; prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { }; prometheus-dcgm-exporter = callPackage ../servers/monitoring/prometheus/dcgm-exporter { }; prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { }; - prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { }; prometheus-domain-exporter = callPackage ../servers/monitoring/prometheus/domain-exporter.nix { }; prometheus-fastly-exporter = callPackage ../servers/monitoring/prometheus/fastly-exporter.nix { }; prometheus-flow-exporter = callPackage ../servers/monitoring/prometheus/flow-exporter.nix { }; From 23480eaa8de723701d3ebae440b06d016c7d3e53 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Tue, 11 Jun 2024 13:47:51 +0000 Subject: [PATCH 10/39] kdePackages.plasma-mobile: fix for services.displayManager.sessionPackages --- pkgs/kde/plasma/plasma-mobile/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/kde/plasma/plasma-mobile/default.nix b/pkgs/kde/plasma/plasma-mobile/default.nix index 92bb1d66d5e3..8c6766e13b03 100644 --- a/pkgs/kde/plasma/plasma-mobile/default.nix +++ b/pkgs/kde/plasma/plasma-mobile/default.nix @@ -2,10 +2,18 @@ mkKdeDerivation, pkg-config, qtsensors, + plasma-workspace, }: mkKdeDerivation { pname = "plasma-mobile"; extraNativeBuildInputs = [pkg-config]; extraBuildInputs = [qtsensors]; + postFixup = '' + substituteInPlace "$out/share/wayland-sessions/plasma-mobile.desktop" \ + --replace-fail \ + "$out/libexec/plasma-dbus-run-session-if-needed" \ + "${plasma-workspace}/libexec/plasma-dbus-run-session-if-needed" + ''; + passthru.providedSessions = [ "plasma-mobile" ]; } From c88d8fe3347138791660799bd4e3565710b521f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Rebenstorf?= Date: Wed, 22 May 2024 13:02:58 +0200 Subject: [PATCH 11/39] autofs: 5.1.6 -> 5.1.9 --- pkgs/os-specific/linux/autofs/default.nix | 28 ++++++++++++----------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index db0e7b48383f..d308ba6594e2 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -1,28 +1,33 @@ { lib, stdenv, fetchurl, flex, bison, linuxHeaders, libtirpc, mount, umount, nfs-utils, e2fsprogs -, libxml2, libkrb5, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto +, libxml2, libkrb5, kmod, openldap, sssd, cyrus_sasl, openssl, rpcsvc-proto, pkgconf , fetchpatch }: stdenv.mkDerivation rec { - version = "5.1.6"; + version = "5.1.9"; pname = "autofs"; src = fetchurl { url = "mirror://kernel/linux/daemons/autofs/v5/autofs-${version}.tar.xz"; - sha256 = "1vya21mb4izj3khcr3flibv7xc15vvx2v0rjfk5yd31qnzcy7pnx"; + sha256 = "sha256-h+avagN5S5Ri6lGXgeUOfSO198ks1Z4RQshdJJOzwks="; }; - patches = [ - # glibc 2.34 compat (fetchpatch { - url = "https://src.fedoraproject.org/rpms/autofs/raw/cc745af5e42396d540d5b3b92fae486e232bf6bd/f/autofs-5.1.7-use-default-stack-size-for-threads.patch"; - sha256 = "sha256-6ETDFbW7EhHR03xFWF+6OJBgn9NX3WW3bGhTNGodaOc="; - excludes = [ "CHANGELOG" ]; + url = "mirror://kernel/linux/daemons/autofs/v5/patches-5.2.0/autofs-5.1.9-update-configure.patch"; + hash = "sha256-BomhNw+lMHcgs5gQlzapZ6p/Ji3gJUVkrLpZssBmwbg="; + }) + (fetchpatch { + url = "mirror://kernel/linux/daemons/autofs/v5/patches-5.2.0/autofs-5.1.9-fix-ldap_parse_page_control-check.patch"; + hash = "sha256-W757LU9r9kuzLeThif2a1olRtxNrJy5suemLS7yfbIU="; + }) + (fetchpatch { + url = "mirror://kernel/linux/daemons/autofs/v5/patches-5.2.0/autofs-5.1.9-fix-crash-in-make_options_string.patch"; + hash = "sha256-YjTdJ50iNhJ2UjFdrKYEFNt04z0PfmElbFa4GuSskLA="; }) ]; preConfigure = '' - configureFlags="--enable-force-shutdown --enable-ignore-busy --with-path=$PATH" + configureFlags="--enable-force-shutdown --enable-ignore-busy --with-path=$PATH --with-libtirpc" export sssldir="${sssd}/lib/sssd/modules" export HAVE_SSS_AUTOFS=1 @@ -37,9 +42,6 @@ stdenv.mkDerivation rec { unset STRIP # Makefile.rules defines a usable STRIP only without the env var. ''; - # configure script is not finding the right path - env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; - installPhase = '' make install SUBDIRS="lib daemon modules man" # all but samples #make install SUBDIRS="samples" # impure! @@ -48,7 +50,7 @@ stdenv.mkDerivation rec { buildInputs = [ linuxHeaders libtirpc libxml2 libkrb5 kmod openldap sssd openssl cyrus_sasl rpcsvc-proto ]; - nativeBuildInputs = [ flex bison ]; + nativeBuildInputs = [ flex bison pkgconf ]; meta = { description = "Kernel-based automounter"; From 769ff8990899134b0e1bb58c7232b0063a05f5ff Mon Sep 17 00:00:00 2001 From: Marcus Ramberg Date: Tue, 11 Jun 2024 19:01:02 +0200 Subject: [PATCH 12/39] cloudflare-warp: set mainProgram, add marcusramberg to maintainers --- pkgs/tools/networking/cloudflare-warp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/cloudflare-warp/default.nix b/pkgs/tools/networking/cloudflare-warp/default.nix index 7f5c9b18438c..0e36b71c55b3 100644 --- a/pkgs/tools/networking/cloudflare-warp/default.nix +++ b/pkgs/tools/networking/cloudflare-warp/default.nix @@ -85,9 +85,11 @@ stdenv.mkDerivation rec { homepage = "https://pkg.cloudflareclient.com/packages/cloudflare-warp"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; + mainProgram = "warp-cli"; maintainers = with maintainers; [ wolfangaukang devpikachu + marcusramberg ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; }; From 1ec17e1ea008a13db282ca08755ef7b8b2692278 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jun 2024 18:02:23 +0000 Subject: [PATCH 13/39] python311Packages.model-checker: 0.4.4 -> 0.4.9 --- pkgs/development/python-modules/model-checker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix index a66ef88a706b..a525adad5947 100644 --- a/pkgs/development/python-modules/model-checker/default.nix +++ b/pkgs/development/python-modules/model-checker/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "model-checker"; - version = "0.4.4"; + version = "0.4.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "model_checker"; inherit version; - hash = "sha256-Ypp1h4qfrY3q27Oohf/UXsl2Vlmuj78hPhlcAzXVMq4="; + hash = "sha256-BUkbCllM2qN5yKTvte2iwnmBXQAzu2N8LTGRfvOTKUQ="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail From 2c52c936f75227602f40f0bf344a4d1299047ee3 Mon Sep 17 00:00:00 2001 From: Daniel Barter Date: Tue, 11 Jun 2024 10:12:12 -0700 Subject: [PATCH 14/39] nixd: fixing cross compilation --- pkgs/development/tools/language-servers/nixd/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix index d17c049d0ead..d35ca9d01173 100644 --- a/pkgs/development/tools/language-servers/nixd/default.nix +++ b/pkgs/development/tools/language-servers/nixd/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + cmake, boost182, gtest, llvmPackages, @@ -36,6 +37,8 @@ let mesonBuildType = "release"; + strictDeps = true; + doCheck = true; meta = { @@ -129,6 +132,8 @@ in boost182 ]; + nativeBuildInputs = common.nativeBuildInputs ++ [ cmake ]; + env.CXXFLAGS = "-include ${nix.dev}/include/nix/config.h"; # See https://github.com/nix-community/nixd/issues/519 From 9658e8b0dcc0725536b621f6039af362cf79634b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jun 2024 22:20:54 +0000 Subject: [PATCH 15/39] python311Packages.slackclient: 3.27.2 -> 3.28.0 --- pkgs/development/python-modules/slackclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index 2a09ebe534b0..a53a43ce80c5 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/pkgs/development/python-modules/slackclient/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "slackclient"; - version = "3.27.2"; + version = "3.28.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-1I08OUseiwCN9vUd56f9IFzCSB9kGjTLojyWm2dIimE="; + hash = "sha256-rsJLjqP1XT1JkFz3iQovF58XdkmVcL+jfjiiI9SqonE="; }; propagatedBuildInputs = [ From 13bc7f0011692f40b0674441d29c20a3acc9c03f Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 11 Jun 2024 20:18:15 -0400 Subject: [PATCH 16/39] libopus: migrate to by-name --- .../libopus/default.nix => by-name/li/libopus/package.nix} | 0 .../libraries => by-name/li}/libopus/test-timeout.patch | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{development/libraries/libopus/default.nix => by-name/li/libopus/package.nix} (100%) rename pkgs/{development/libraries => by-name/li}/libopus/test-timeout.patch (100%) diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/by-name/li/libopus/package.nix similarity index 100% rename from pkgs/development/libraries/libopus/default.nix rename to pkgs/by-name/li/libopus/package.nix diff --git a/pkgs/development/libraries/libopus/test-timeout.patch b/pkgs/by-name/li/libopus/test-timeout.patch similarity index 100% rename from pkgs/development/libraries/libopus/test-timeout.patch rename to pkgs/by-name/li/libopus/test-timeout.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a425eafd46c3..8558120c5ee6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22665,8 +22665,6 @@ with pkgs; libopenglrecorder = callPackage ../development/libraries/libopenglrecorder { }; - libopus = callPackage ../development/libraries/libopus { }; - libopusenc = callPackage ../development/libraries/libopusenc { }; libosinfo = callPackage ../development/libraries/libosinfo { }; From 3b8afbd09644c296931f1c2ff721094aeb7cc907 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 11 Jun 2024 20:18:45 -0400 Subject: [PATCH 17/39] libopus: format with nixfmt --- pkgs/by-name/li/libopus/package.nix | 34 ++++++++++++++++------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/li/libopus/package.nix b/pkgs/by-name/li/libopus/package.nix index a841d1cfa903..dc199538671c 100644 --- a/pkgs/by-name/li/libopus/package.nix +++ b/pkgs/by-name/li/libopus/package.nix @@ -1,18 +1,19 @@ -{ lib -, stdenv -, fetchurl -, gitUpdater -, meson -, python3 -, ninja -, fixedPoint ? false -, withCustomModes ? true -, withIntrinsics ? stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isx86 -, withAsm ? false +{ + lib, + stdenv, + fetchurl, + gitUpdater, + meson, + python3, + ninja, + fixedPoint ? false, + withCustomModes ? true, + withIntrinsics ? stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isx86, + withAsm ? false, -# tests -, ffmpeg-headless -, testers + # tests + ffmpeg-headless, + testers, }: stdenv.mkDerivation (finalAttrs: { @@ -33,7 +34,10 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs meson/ ''; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; nativeBuildInputs = [ meson From 9beb441b1542a997cacf77a724cfc137d846d9b3 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 11 Jun 2024 20:19:30 -0400 Subject: [PATCH 18/39] libopus: adopt --- pkgs/by-name/li/libopus/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libopus/package.nix b/pkgs/by-name/li/libopus/package.nix index dc199538671c..8525de7a4bdd 100644 --- a/pkgs/by-name/li/libopus/package.nix +++ b/pkgs/by-name/li/libopus/package.nix @@ -78,6 +78,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://gitlab.xiph.org/xiph/opus/-/releases/v${finalAttrs.version}"; license = licenses.bsd3; platforms = platforms.all; - maintainers = [ ]; + maintainers = with maintainers; [ getchoo ]; }; }) From 6fb27aeca46e7ebf32915d48bc63533694c5ee9d Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 11 Jun 2024 20:19:54 -0400 Subject: [PATCH 19/39] libopus: don't overuse `with lib` https://github.com/NixOS/nixpkgs/issues/208242 --- pkgs/by-name/li/libopus/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/libopus/package.nix b/pkgs/by-name/li/libopus/package.nix index 8525de7a4bdd..5d03f25b4760 100644 --- a/pkgs/by-name/li/libopus/package.nix +++ b/pkgs/by-name/li/libopus/package.nix @@ -72,12 +72,12 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { + meta = { description = "Open, royalty-free, highly versatile audio codec"; homepage = "https://opus-codec.org/"; changelog = "https://gitlab.xiph.org/xiph/opus/-/releases/v${finalAttrs.version}"; - license = licenses.bsd3; - platforms = platforms.all; - maintainers = with maintainers; [ getchoo ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ getchoo ]; }; }) From 2e6dd437896eb3e67a72424abdf1dcb6d42488b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Jun 2024 01:05:59 +0000 Subject: [PATCH 20/39] bitcoin-abc: 0.29.5 -> 0.29.6 --- pkgs/applications/blockchains/bitcoin-abc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin-abc/default.nix b/pkgs/applications/blockchains/bitcoin-abc/default.nix index f866800a9145..8389779a2c8a 100644 --- a/pkgs/applications/blockchains/bitcoin-abc/default.nix +++ b/pkgs/applications/blockchains/bitcoin-abc/default.nix @@ -25,13 +25,13 @@ mkDerivation rec { pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc"; - version = "0.29.5"; + version = "0.29.6"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - hash = "sha256-1gw8VgAVflFjYq3/Rd+GgvCmpG2fjtpPvKU2TtxubWs="; + hash = "sha256-q+7NoZQDzEXBOFeob9Om5mnuocbaYjvdckv7Cur7nCI="; }; nativeBuildInputs = [ pkg-config cmake ]; From 2378b49876928e8df659dcc31e51176baea00b55 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Jun 2024 01:40:23 +0000 Subject: [PATCH 21/39] lint-staged: 15.2.5 -> 15.2.6 --- pkgs/by-name/li/lint-staged/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix index 82a8de430623..0fa6179dca68 100644 --- a/pkgs/by-name/li/lint-staged/package.nix +++ b/pkgs/by-name/li/lint-staged/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "lint-staged"; - version = "15.2.5"; + version = "15.2.6"; src = fetchFromGitHub { owner = "okonet"; repo = "lint-staged"; rev = "v${version}"; - hash = "sha256-Mr8Gtm5kXv+ZcLAMCe8JadJwlTRjD29xojN6Tyzdfb8="; + hash = "sha256-Jn6KGfgL4Si48hdg4glACe6AO5QzPgnasYhHMivzMGk="; }; - npmDepsHash = "sha256-BAVxloOuHodxPLoN5iMQcL04rdmkIEL6UYPnp2HbTe0="; + npmDepsHash = "sha256-6BKx06h+laYSMNm36R992oXYwCDS90F+nh21MnHA998="; dontNpmBuild = true; From 58f15f1373cc8900fba98254b73e266dfd668b9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Jun 2024 01:57:25 +0000 Subject: [PATCH 22/39] mdbook-admonish: 1.17.0 -> 1.17.1 --- pkgs/tools/text/mdbook-admonish/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-admonish/default.nix b/pkgs/tools/text/mdbook-admonish/default.nix index 56a52da78427..f579315cd908 100644 --- a/pkgs/tools/text/mdbook-admonish/default.nix +++ b/pkgs/tools/text/mdbook-admonish/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-admonish"; - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "tommilligan"; repo = pname; rev = "v${version}"; - hash = "sha256-Pks33QDAPocUjZTWRS69g9ZkubMqzQezYtJb0UNnd3Q="; + hash = "sha256-Jj3mbsH/rFrUTWcgT4+KQJ2Bae58STHBB+7oZwbrhLk="; }; - cargoHash = "sha256-HXUPdur45CkrzQrCi8YRlyKjk++GRFCcJwzfoX2ix+M="; + cargoHash = "sha256-a2JGpIvI65djxyB1LZFWgIQmhsLPLhiYkyvqKwysgQo="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From a7e0e4641c45382ab88e60088ee05c7350519402 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Jun 2024 01:58:02 +0000 Subject: [PATCH 23/39] misconfig-mapper: 1.3.0 -> 1.3.1 --- pkgs/by-name/mi/misconfig-mapper/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix index 8d081453481f..5db723ea0365 100644 --- a/pkgs/by-name/mi/misconfig-mapper/package.nix +++ b/pkgs/by-name/mi/misconfig-mapper/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "misconfig-mapper"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "intigriti"; repo = "misconfig-mapper"; rev = "refs/tags/v${version}"; - hash = "sha256-LrXx5OFpF+qsEhblBaXqsSGtw/Kp9FqjouCbMywpKg0="; + hash = "sha256-pQAv4waEocsSDGSOJlK7s5g9rkQGVJRGOpcB3HvG2yo="; }; - vendorHash = "sha256-lkVTgnWdk9eW6QtKScK8NckcXGzsHeIwjSoUx85AGU8="; + vendorHash = "sha256-T4SDL1Pq3mfN6Qd13Safof1EgCqQVB2+K1qJHm+2ilc="; ldflags = [ "-s" From cbd745cdf04eb1398acd77b4e536860312c7bc2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Jun 2024 04:05:17 +0000 Subject: [PATCH 24/39] tor: 0.4.8.11 -> 0.4.8.12 --- pkgs/tools/security/tor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 2f33862fcffe..30eb8360fe39 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.8.11"; + version = "0.4.8.12"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-jyvfkOYzgHgSNap9YE4VlXDyg+zuZ0Zwhz2LtwUsjgc="; + sha256 = "sha256-ynzHNdmON0e1jy88wU+ATdeJ+g+zM6hNy2vXCtu4yHQ="; }; outputs = [ "out" "geoip" ]; From e7867f605d7ff41f9b5cc1762ecd87380c5ba6e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Jun 2024 04:17:23 +0000 Subject: [PATCH 25/39] dynamodb-local: 2.5.0 -> 2.5.1 --- pkgs/by-name/dy/dynamodb-local/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dy/dynamodb-local/package.nix b/pkgs/by-name/dy/dynamodb-local/package.nix index c15a708cdaef..146077be7095 100644 --- a/pkgs/by-name/dy/dynamodb-local/package.nix +++ b/pkgs/by-name/dy/dynamodb-local/package.nix @@ -26,11 +26,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "dynamodb-local"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { - url = "https://d1ni2b6xgvw0s0.cloudfront.net/v2.x/dynamodb_local_2024-05-28.tar.gz"; - hash = "sha256-vwExzekzNdNWcEOHZ22b5F9pADdqZ4XSWscrndfPcsQ="; + url = "https://d1ni2b6xgvw0s0.cloudfront.net/v2.x/dynamodb_local_2024-06-06.tar.gz"; + hash = "sha256-fbd+F9sk/QJZgS4O2mFvEKbbV9hAMLuCt22BMriFYBQ="; }; sourceRoot = "."; From 237e1c9989f3c70eb74b2418a03bac61f1c70a2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Jun 2024 04:54:10 +0000 Subject: [PATCH 26/39] python311Packages.pyvista: 0.43.8 -> 0.43.9 --- pkgs/development/python-modules/pyvista/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix index 2f17321b6010..87bdf41a841c 100644 --- a/pkgs/development/python-modules/pyvista/default.nix +++ b/pkgs/development/python-modules/pyvista/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyvista"; - version = "0.43.8"; + version = "0.43.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ZAj0aIinaVet/zK8yF1LrB63hrb2dTmTROA8uNl0yug="; + hash = "sha256-Trtf898ctSO3lyXC9aVy8Yrh4dCuNBvPiGKzG+D8m5o="; }; nativeBuildInputs = [ setuptools ]; From 0d1955d3a5e67ca42c205cd8bcac9b24cf06f325 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Jun 2024 04:54:51 +0000 Subject: [PATCH 27/39] json-fortran: 8.5.2 -> 9.0.1 --- pkgs/development/libraries/json-fortran/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/json-fortran/default.nix b/pkgs/development/libraries/json-fortran/default.nix index de1909fae444..52ec487c0636 100644 --- a/pkgs/development/libraries/json-fortran/default.nix +++ b/pkgs/development/libraries/json-fortran/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "json-fortran"; - version = "8.5.2"; + version = "9.0.1"; src = fetchFromGitHub { owner = "jacobwilliams"; repo = pname; rev = version; - hash = "sha256-ja/MIqAe4V5nasdtWThkRxNWCx4+twz7/dX4+8X+Bt8="; + hash = "sha256-nhT2zLyt3ORi35h9KzOiIuD50GGUCZ/Z5SX8UF3rqQs="; }; nativeBuildInputs = [ From ced153467bc5db3208a89ccdd5322035968fab6d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Jun 2024 08:09:29 +0200 Subject: [PATCH 28/39] python312Packages.tencentcloud-sdk-python: 3.0.1165 -> 3.0.1166 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1165...3.0.1166 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1166/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 19f491b08bdb..4173fcfde7e0 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1165"; + version = "3.0.1166"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-14+VkxGZVThUqzvty7FdALXCB3Wmzp8L/5A9/L6sveo="; + hash = "sha256-bzn858miWIsu3zzwkxAAy0Fo3xDfS10ojp7TpJEjt6M="; }; build-system = [ setuptools ]; From 915f705c9abc3227e4308a412ede3569ee2362a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Jun 2024 08:10:00 +0200 Subject: [PATCH 29/39] python312Packages.boto3-stubs: 1.34.122 -> 1.34.124 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 8db74a88dc19..d5f683371d50 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.122"; + version = "1.34.124"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-gJdKU5mNiAr5dMVNWE/XBzOxD4QkbkDnRY6vTTsnoXY="; + hash = "sha256-X+092AtE6I/k6MLyFiBVGJRGNty8vSgG0E4NGVN68Ws="; }; build-system = [ setuptools ]; From 2f4a86fc9bc0483424f82bb31ff8d405808c7016 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Jun 2024 08:10:03 +0200 Subject: [PATCH 30/39] python312Packages.botocore-stubs: 1.34.122 -> 1.34.124 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index adc61ec58d43..270249458c84 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.122"; + version = "1.34.124"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-oX1MW1o8EOj6tm3Bf78qHbzJ2mC44J0jps+FHM7b+q8="; + hash = "sha256-naShit9yT/YXT0/TaEwb4bFhe8fdWPSsBPghiY1SuX8="; }; nativeBuildInputs = [ poetry-core ]; From ad88908a16e10ccc63fe86da55e8c634308b64d9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Jun 2024 08:13:36 +0200 Subject: [PATCH 31/39] cnspec: 11.7.0 -> 11.8.0 Diff: https://github.com/mondoohq/cnspec/compare/refs/tags/v11.7.0...v11.8.0 Changelog: https://github.com/mondoohq/cnspec/releases/tag/v11.8.0 --- pkgs/tools/security/cnspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 6ba710039516..2cd981a04bcf 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.7.0"; + version = "11.8.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-b7TMZXEE8b7klgNZGG9ka6+6lHn5K7YJXV4OaB+Wnu4="; + hash = "sha256-gRmOHDwhOV2dpDdBS+SpyLBq2deL0mVwwgEod4a8BCM="; }; proxyVendor = true; - vendorHash = "sha256-7nTJk8PCcqpMCO4LVNQdnVE+gEoY3SfQYsnV50d2w9w="; + vendorHash = "sha256-P0HRV7jRF8QZxruoQv2V6x/9v2rmZ3Xe5zZzZ3wj9x0="; subPackages = [ "apps/cnspec" ]; From 30b955d197ee218679d6d55b7d2a575d7eb85ee9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Jun 2024 08:14:40 +0200 Subject: [PATCH 32/39] python312Packages.aioopenexchangerates: 0.4.11 -> 0.4.12 Diff: https://github.com/MartinHjelmare/aioopenexchangerates/compare/refs/tags/v0.4.11...v0.4.12 Changelog: https://github.com/MartinHjelmare/aioopenexchangerates/blob/v0.4.12/CHANGELOG.md --- .../python-modules/aioopenexchangerates/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix index fc5eb933a98e..8f098bb091a8 100644 --- a/pkgs/development/python-modules/aioopenexchangerates/default.nix +++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioopenexchangerates"; - version = "0.4.11"; + version = "0.4.12"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aioopenexchangerates"; rev = "refs/tags/v${version}"; - hash = "sha256-8AScYCDgv8Dkjt/0WJ4P2q2H9dykuq3w00qDDP8PiSs="; + hash = "sha256-A9d7nAqVwiIsS6f+A4PCGbONdhZb55JSmNuAFG990Ek="; }; postPatch = '' From d51c77bd81150f6f4f219708d335ee85b3d52452 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Jun 2024 08:17:24 +0200 Subject: [PATCH 33/39] python312Packages.goodwe: 0.4.6 -> 0.4.7 Diff: https://github.com/marcelblijleven/goodwe/compare/refs/tags/v0.4.6...v0.4.7 Changelog: https://github.com/marcelblijleven/goodwe/releases/tag/v0.4.7 --- pkgs/development/python-modules/goodwe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index ef2976a2694a..1616f17a4895 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.4.6"; + version = "0.4.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = "goodwe"; rev = "refs/tags/v${version}"; - hash = "sha256-Si2sdqaAhENF/PjaJeD3VdZATecJUsX7TtfX819800A="; + hash = "sha256-Z+CTwG9aJ/HFnrWXJXpUDgh60/crxaBXJuBSozZIoxI="; }; postPatch = '' From e8567f64d750abdc6c8c316db6d85890115eb1b1 Mon Sep 17 00:00:00 2001 From: leiserfg Date: Sat, 1 Jun 2024 14:07:57 +0200 Subject: [PATCH 34/39] glslviewer: 1.6.8 -> 3.2.4 --- pkgs/development/tools/glslviewer/default.nix | 80 +++++++++---------- 1 file changed, 37 insertions(+), 43 deletions(-) diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index 4be67a29e399..fd84492da6ae 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -1,60 +1,54 @@ -{ lib, stdenv, fetchFromGitHub, glfw, pkg-config, libXrandr, libXdamage -, libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi -, libX11, libGLU, python3Packages, ensureNewerSourcesForZipFilesHook -, Cocoa +{ + stdenv, + cmake, + ninja, + lib, + fetchFromGitHub, + pkg-config, + libX11, + libXrandr, + libXinerama, + libXcursor, + libXi, + libXext, + libGLU, + ffmpeg, + ncurses, + Cocoa, }: - stdenv.mkDerivation rec { pname = "glslviewer"; - version = "1.6.8"; - + version = "3.2.4"; src = fetchFromGitHub { owner = "patriciogonzalezvivo"; repo = "glslViewer"; + fetchSubmodules = true; rev = version; - sha256 = "0v7x93b61ama0gmzlx1zc56jgi7bvzsfvbkfl82xzwf2h5g1zni7"; + sha256 = "sha256-Ve3wmX5+kABCu8IRe4ySrwsBJm47g1zvMqDbqrpQl88="; }; - - postPatch = '' - sed '1i#include ' -i src/tools/text.cpp # gcc12 - sed '8i#include ' -i src/io/fs.cpp # gcc13 - ''; - - nativeBuildInputs = [ pkg-config ensureNewerSourcesForZipFilesHook python3Packages.six ]; - buildInputs = [ - glfw libGLU glfw libXrandr libXdamage - libXext libXrender libXinerama libXcursor libXxf86vm - libXi libX11 - ] ++ (with python3Packages; [ python setuptools wrapPython ]) + nativeBuildInputs = [cmake ninja pkg-config]; + buildInputs = + [ + libX11 + libXrandr + libXinerama + libXcursor + libXi + libXext + libGLU + ncurses + ffmpeg + ] ++ lib.optional stdenv.isDarwin Cocoa; - pythonPath = with python3Packages; [ pyyaml requests ]; - - # Makefile has /usr/local/bin hard-coded for 'make install' - preConfigure = '' - substituteInPlace Makefile \ - --replace '/usr/local' "$out" \ - --replace '/usr/bin/clang++' 'clang++' - substituteInPlace Makefile \ - --replace 'python setup.py install' "python setup.py install --prefix=$out" - 2to3 -w bin/* - ''; - - preInstall = '' - mkdir -p $out/bin $(toPythonPath "$out") - export PYTHONPATH=$PYTHONPATH:$(toPythonPath "$out") - ''; - - postInstall = '' - wrapPythonPrograms - ''; meta = with lib; { description = "Live GLSL coding renderer"; homepage = "https://patriciogonzalezvivo.com/2015/glslViewer/"; license = licenses.bsd3; - platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.hodapp ]; + maintainers = [maintainers.hodapp]; + platforms = platforms.unix; + mainProgram = "glslViewer"; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.isDarwin; }; } From 2af18dc0566093d86fe4d39c5bec91bddb132c1c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Jun 2024 08:30:59 +0200 Subject: [PATCH 35/39] python311Packages.slack-sdk: 3.27.2 -> 3.28.0 Diff: https://github.com/slackapi/python-slack-sdk/compare/refs/tags/v3.27.2...v3.28.0 Changelog: https://github.com/slackapi/python-slack-sdk/releases/tag/v3.28.0 --- pkgs/development/python-modules/slack-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 4ef216531c62..a3a093100864 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.27.2"; + version = "3.28.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-1I08OUseiwCN9vUd56f9IFzCSB9kGjTLojyWm2dIimE="; + hash = "sha256-rsJLjqP1XT1JkFz3iQovF58XdkmVcL+jfjiiI9SqonE="; }; postPatch = '' From d913a66f27204962d7c3f42c8bb8e8aee89785c4 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 11 Jun 2024 22:05:15 +0200 Subject: [PATCH 36/39] ocaml: remove left-over builder.sh This file was last used in 3.08.0.nix removed in #114848 3 years ago. --- pkgs/development/compilers/ocaml/builder.sh | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 pkgs/development/compilers/ocaml/builder.sh diff --git a/pkgs/development/compilers/ocaml/builder.sh b/pkgs/development/compilers/ocaml/builder.sh deleted file mode 100644 index 85b26848f4e4..000000000000 --- a/pkgs/development/compilers/ocaml/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi -source $stdenv/setup - -configureFlags="-prefix $out $configureFlags" -genericBuild - -#cd emacs/ -#mkdir -p $out/share/ocaml/emacs -#make EMACSDIR=$out/share/ocaml/emacs install From 436cf3aae3647c8ee98855a12a36fb8d3d9fae42 Mon Sep 17 00:00:00 2001 From: seth Date: Wed, 12 Jun 2024 03:45:39 -0400 Subject: [PATCH 37/39] libopus: add jopejoe1 to maintainers --- pkgs/by-name/li/libopus/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libopus/package.nix b/pkgs/by-name/li/libopus/package.nix index 5d03f25b4760..cdf00a244ba4 100644 --- a/pkgs/by-name/li/libopus/package.nix +++ b/pkgs/by-name/li/libopus/package.nix @@ -78,6 +78,6 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://gitlab.xiph.org/xiph/opus/-/releases/v${finalAttrs.version}"; license = lib.licenses.bsd3; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ getchoo ]; + maintainers = with lib.maintainers; [ getchoo jopejoe1 ]; }; }) From b772371546a7a376e6f2d078af76f88cb73a8c8b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Jun 2024 07:56:47 +0000 Subject: [PATCH 38/39] trufflehog: 3.78.0 -> 3.78.1 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index aa91f36edffd..e94cfbd846ea 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.78.0"; + version = "3.78.1"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-mMRQV+ehG0ol6wLjt73o0lcytd27WfGvep7Js0h/AMI="; + hash = "sha256-Gek42O48RDkygeq+9oaV2f9UephOjxrevC6uQeAn24s="; }; - vendorHash = "sha256-2SIfV3DM97ZI1valXHDphyAxTfE2USxH0LACgwRCgKE="; + vendorHash = "sha256-KSIHJe83F2PBWBYe/aoWJrqzGvDwZhrrCvJ2GVBnmfo="; proxyVendor = true; From a45d61da22a36e22b1d43f369cd3ed462cc677a8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 12 Jun 2024 10:14:40 +0200 Subject: [PATCH 39/39] qovery-cli: 0.94.10 -> 0.94.11 Diff: https://github.com/Qovery/qovery-cli/compare/refs/tags/v0.94.10...v0.94.11 Changelog: https://github.com/Qovery/qovery-cli/releases/tag/v0.94.11 --- pkgs/tools/admin/qovery-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 0f2b5f0b9170..58645fa7902c 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.94.10"; + version = "0.94.11"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-btB/GBNwgNkpc2Ql+AqGl1ZOAjxnbAlQFE54rVxogvs="; + hash = "sha256-2p3KUIu3L78X2/i5B6+RoMmoyG5vqg8RWDXeUYlpqwU="; }; - vendorHash = "sha256-vFZ2+F0HktAQA6abQlD5HJ3CLMgvJjs2xx6O2Jc2oeg="; + vendorHash = "sha256-OKerPm5odNWCD5AqfNHqcQSeWu53ZVqCbIowzf6tO9A="; nativeBuildInputs = [ installShellFiles ];