From a3050a7481f33d1274c85c5a71c0df75283a7746 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 28 Jan 2025 22:18:51 +0100 Subject: [PATCH 001/165] domination: add updateScript --- pkgs/by-name/do/domination/package.nix | 2 ++ pkgs/by-name/do/domination/update.tcl | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100755 pkgs/by-name/do/domination/update.tcl diff --git a/pkgs/by-name/do/domination/package.nix b/pkgs/by-name/do/domination/package.nix index 4b236657ba25..d4c515088917 100644 --- a/pkgs/by-name/do/domination/package.nix +++ b/pkgs/by-name/do/domination/package.nix @@ -96,6 +96,8 @@ stdenv.mkDerivation { domination-starts = nixosTests.domination; }; + passthru.updateScript = ./update.tcl; + meta = with lib; { homepage = "https://domination.sourceforge.net/"; downloadPage = "https://domination.sourceforge.net/download.shtml"; diff --git a/pkgs/by-name/do/domination/update.tcl b/pkgs/by-name/do/domination/update.tcl new file mode 100755 index 000000000000..3df285bd29b8 --- /dev/null +++ b/pkgs/by-name/do/domination/update.tcl @@ -0,0 +1,8 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i tclsh -p tcl common-updater-scripts curl + +set changelog_url https://sourceforge.net/p/domination/code/HEAD/tree/Domination/ChangeLog.txt?format=raw + +set changelog [exec -ignorestderr curl -Ls $changelog_url] +regexp {(\d+(\.\d+)*) \(\d+\.\d+\.\d+\) \(svn rev (\d+)\)} $changelog _ version _ rev +exec -ignorestderr update-source-version domination $version --rev=$rev From aef69a3c05ca366cf20a0bd8d913483bbc2828cf Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 28 Jan 2025 22:20:24 +0100 Subject: [PATCH 002/165] domination: 1.3.1 -> 1.3.3 --- pkgs/by-name/do/domination/package.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/do/domination/package.nix b/pkgs/by-name/do/domination/package.nix index d4c515088917..d4d43547ffbf 100644 --- a/pkgs/by-name/do/domination/package.nix +++ b/pkgs/by-name/do/domination/package.nix @@ -30,16 +30,18 @@ let in stdenv.mkDerivation { pname = "domination"; - version = "1.3.1"; + version = "1.3.3"; # The .zip releases do not contain the build.xml file src = fetchsvn { url = "https://svn.code.sf.net/p/domination/code/Domination"; # There are no tags in the repository. - # Look for commits like "new version x.y.z info on website" - # or "website update for x.y.z". - rev = "2538"; - hash = "sha256-wsLBHkQc1SW+PToyCXIek6qRrRga2nLLkM+5msrnsBo="; + # Look for "(svn rev X)" at + # https://sourceforge.net/p/domination/code/HEAD/tree/Domination/ChangeLog.txt + # Alternatively, look for revs like "changelog update", + # "new version x.y.z info on website", or "website update for x.y.z". + rev = "2616"; + hash = "sha256-/h9TstRxMpeoEsIeSN0MRmyRsiBHomguIPch1Zda8s8="; }; nativeBuildInputs = [ From d8dc29ec91415052648ff0f7536d632f93042818 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 19 Feb 2025 12:42:37 -0500 Subject: [PATCH 003/165] linode-cli: 5.54.0 -> 5.56.2 --- pkgs/tools/virtualization/linode-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index 8a8353ec1dc5..a174e47c63ed 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -16,7 +16,7 @@ }: let - hash = "sha256-ITsZUjk0O7SvXOsj/sUD99pJPOZvOcLV1I6avV6Jeds="; + hash = "sha256-QQxadKVEIh1PvD8FdYgJ/U1iyWdy6FvO+LUELQ70KKw="; # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. specVersion = "4.176.0"; specHash = "sha256-P1E8Ga5ckrsw/CX0kxFef5fe8/p/pDCLuleX9wR5l48="; @@ -29,7 +29,7 @@ in buildPythonApplication rec { pname = "linode-cli"; - version = "5.54.0"; + version = "5.56.2"; pyproject = true; src = fetchPypi { From 7664ad1312793aabc5417b826426f43e48578bf9 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Fri, 21 Feb 2025 15:19:37 +0100 Subject: [PATCH 004/165] mdsf: init at 0.5.1 --- pkgs/by-name/md/mdsf/package.nix | 45 ++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/md/mdsf/package.nix diff --git a/pkgs/by-name/md/mdsf/package.nix b/pkgs/by-name/md/mdsf/package.nix new file mode 100644 index 000000000000..546c55c75ed6 --- /dev/null +++ b/pkgs/by-name/md/mdsf/package.nix @@ -0,0 +1,45 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: +let + pname = "mdsf"; + version = "0.5.1"; +in +rustPlatform.buildRustPackage { + inherit pname version; + + src = fetchFromGitHub { + owner = "hougesen"; + repo = "mdsf"; + tag = "v${version}"; + hash = "sha256-KHTWE3ENRc/VHrgwAag6DsnEU3c8Nqw15jR5jWlNrk4="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-kgqRwYjDc/eV9wv1G6aAhfrGpoYDPCFfqaTm+T2p7uw="; + + checkFlags = [ + "--skip=tests::it_should_add_go_package_if_missing" + "--skip=tests::it_should_format_the_code" + "--skip=tests::it_should_format_the_codeblocks_that_start_with_whitespace" + "--skip=tests::it_should_not_care_if_go_package_is_set" + "--skip=tests::it_should_not_modify_outside_blocks" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Tool for formatting a linting markdown code snippets using language specific tools"; + homepage = "https://github.com/hougesen/mdsf"; + changelog = "https://github.com/hougesen/mdsf/releases"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; + mainProgram = "mdsf"; + }; +} From 057a4bb60e19c7d3bb4317351be93b76c1b5fc31 Mon Sep 17 00:00:00 2001 From: Andreas Wiese Date: Tue, 18 Mar 2025 22:51:40 +0100 Subject: [PATCH 005/165] ham: 2023-10-06 -> 2025-02-25 --- .../ha/ham/package.nix} | 27 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 -- pkgs/top-level/perl-packages.nix | 2 -- 3 files changed, 14 insertions(+), 17 deletions(-) rename pkgs/{development/perl-modules/ham/default.nix => by-name/ha/ham/package.nix} (75%) diff --git a/pkgs/development/perl-modules/ham/default.nix b/pkgs/by-name/ha/ham/package.nix similarity index 75% rename from pkgs/development/perl-modules/ham/default.nix rename to pkgs/by-name/ha/ham/package.nix index 65d9701d614d..3bc77e26475a 100644 --- a/pkgs/development/perl-modules/ham/default.nix +++ b/pkgs/by-name/ha/ham/package.nix @@ -1,39 +1,40 @@ { lib, - buildPerlPackage, + perlPackages, fetchFromGitHub, makeWrapper, openssh, - GitRepository, - URI, - XMLParser, }: -buildPerlPackage { +perlPackages.buildPerlPackage { pname = "ham-unstable"; - version = "2023-10-06"; + version = "2025-02-25"; src = fetchFromGitHub { owner = "kernkonzept"; repo = "ham"; - rev = "90d104ce481ee8f9b770be4b37d97f34eef5f82f"; - hash = "sha256-DeHH7k9K7CmQW6eOyf8TCV/HNYS30oFnI1b8ztBDk/o="; + rev = "81b6f05fd91865c7d42b94a683388504489356dc"; + hash = "sha256-a1JaUD/jrF7Yf+vyUoKQFjojxenmsCVw3Uo8u7RjPiQ="; }; outputs = [ "out" ]; - nativeBuildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ - openssh + nativeBuildInputs = [ + makeWrapper + ]; + buildInputs = with perlPackages; [ GitRepository URI XMLParser ]; + propagatedBuildInputs = [ + openssh + ]; preConfigure = '' - patchShebangs . - touch Makefile.PL rm -f Makefile + touch Makefile.PL + patchShebangs . ''; installPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db392a2b84ea..f60ba11fe048 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3592,8 +3592,6 @@ with pkgs; hareThirdParty = recurseIntoAttrs (callPackage ./hare-third-party.nix { }); - ham = pkgs.perlPackages.ham; - hdf5 = callPackage ../tools/misc/hdf5 { fortranSupport = false; fortran = gfortran; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5294bca52c80..df489d37af69 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11479,8 +11479,6 @@ with self; { }; }; - ham = callPackage ../development/perl-modules/ham { }; - HashFlatten = buildPerlPackage { pname = "Hash-Flatten"; version = "1.19"; From b9f1de8b69c3cc3cd638c5373f0613dfc0944b09 Mon Sep 17 00:00:00 2001 From: paumr Date: Wed, 19 Mar 2025 13:33:36 +0100 Subject: [PATCH 006/165] davmail: 6.2.2 -> 6.3.0 --- pkgs/applications/networking/davmail/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index 6f971f0c849f..9a49603f61da 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -17,17 +17,17 @@ }: let - rev = 3546; + rev = 3627; jre' = if preferZulu then zulu else jre; gtk' = if preferGtk3 then gtk3 else gtk2; in stdenv.mkDerivation rec { pname = "davmail"; - version = "6.2.2"; + version = "6.3.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-${toString rev}.zip"; - hash = "sha256-45paGy6SfUFXK6vY8L4tHFYiio1/5ah9vTyGImdgwHI="; + hash = "sha256-Yh61ZHsEMF6SchLEyBV3rRI7pJ/bvR2K4G8U6jrPa3A="; }; postPatch = '' From cfc8fc76c768f379af8f783b87e2ca54342f53fc Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Sat, 22 Mar 2025 19:33:51 +0100 Subject: [PATCH 007/165] modsecurity_standalone: 2.9.7 -> 2.9.8 --- pkgs/by-name/mo/modsecurity_standalone/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mo/modsecurity_standalone/package.nix b/pkgs/by-name/mo/modsecurity_standalone/package.nix index ffcefb8beb7b..e87cd1720579 100644 --- a/pkgs/by-name/mo/modsecurity_standalone/package.nix +++ b/pkgs/by-name/mo/modsecurity_standalone/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "owasp-modsecurity"; repo = "modsecurity"; rev = "v${version}"; - sha256 = "sha256-hJ8wYeC83dl85bkUXGZKHpHzw9QRgtusj1/+Coxsx0k="; + hash = "sha256-fJ5XeO5m5LlImAuzIvXVVWkc9awbaRI3NWWOOwGrshI="; }; nativeBuildInputs = [ From c372f06594b2289aae0f98bf207df27ec560319f Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Sat, 22 Mar 2025 19:34:10 +0100 Subject: [PATCH 008/165] modsecurity_standalone: unbreak on GCC 14, modernize --- .../mo/modsecurity_standalone/package.nix | 56 +++++++++++++++---- 1 file changed, 46 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/mo/modsecurity_standalone/package.nix b/pkgs/by-name/mo/modsecurity_standalone/package.nix index e87cd1720579..5a1ee330d2b7 100644 --- a/pkgs/by-name/mo/modsecurity_standalone/package.nix +++ b/pkgs/by-name/mo/modsecurity_standalone/package.nix @@ -13,6 +13,8 @@ luaSupport ? false, lua5, perl, + fetchpatch, + versionCheckHook, }: let @@ -20,14 +22,14 @@ let optional = lib.optional; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "modsecurity"; - version = "2.9.7"; + version = "2.9.8"; src = fetchFromGitHub { owner = "owasp-modsecurity"; repo = "modsecurity"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-fJ5XeO5m5LlImAuzIvXVVWkc9awbaRI3NWWOOwGrshI="; }; @@ -56,13 +58,40 @@ stdenv.mkDerivation rec { "--with-lua=${luaValue}" ]; + enableParallelBuilding = true; + + env.NIX_CFLAGS_COMPILE = toString [ + # msc_test.c:86:5: error: initialization of 'int' from 'void *' makes integer from pointer without a cast [] + "-Wno-error=int-conversion" + ]; + outputs = [ "out" "nginx" ]; - # by default modsecurity's install script copies compiled output to httpd's modules folder - # this patch removes those lines - patches = [ ./Makefile.am.patch ]; + patches = [ + # by default modsecurity's install script copies compiled output to httpd's modules folder + # this patch removes those lines + ./Makefile.am.patch + # remove when 2.9.9 is released + (fetchpatch { + name = "move-id_log"; + url = "https://github.com/owasp-modsecurity/ModSecurity/commit/149376377ecef9ecc36ee81d5b666fc0ac7e249b.patch"; + hash = "sha256-KjQGqSBt/u9zPZY1aSIupnYHleJbsOAOk3Y2bNOyRxk="; + }) + # remove when 2.9.9 is released + (fetchpatch { + name = "gcc-format-security"; + url = "https://github.com/owasp-modsecurity/ModSecurity/commit/cddd9a7eb5585a9b3be1f9bdcadcace8f60f5808.patch"; + hash = "sha256-H1wkZQ5bTQIRhlEvvvj7YCBi9qndRgHgKTnE9Cusq3I="; + }) + # remove when 2.9.9 is released + (fetchpatch { + name = "gcc-incompatible-pointer-type"; + url = "https://github.com/owasp-modsecurity/ModSecurity/commit/4919814a5cf0e7911f71856ed872b0e73b659a0a.patch"; + hash = "sha256-9JzCtiLf43xw6i4NqQpok37es+kuWXZWKdJum28Hx4M="; + }) + ]; doCheck = true; nativeCheckInputs = [ perl ]; @@ -72,11 +101,18 @@ stdenv.mkDerivation rec { cp -R * $nginx ''; - meta = with lib; { + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "-v"; + versionCheckProgram = "${placeholder "out"}/bin/mlogc"; + + meta = { description = "Open source, cross-platform web application firewall (WAF)"; - license = licenses.asl20; + license = lib.licenses.asl20; homepage = "https://github.com/owasp-modsecurity/ModSecurity"; - maintainers = with maintainers; [ offline ]; + maintainers = with lib.maintainers; [ offline ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) From fd811eb3fe3db841e4fb7e9f3bb17ad35f0b2304 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 25 Mar 2025 21:33:05 +0100 Subject: [PATCH 009/165] rustls-ffi: 0.14.1 -> 0.15.0 https://github.com/rustls/rustls-ffi/releases/tag/v0.15.0 --- pkgs/by-name/ru/rustls-ffi/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ru/rustls-ffi/package.nix b/pkgs/by-name/ru/rustls-ffi/package.nix index 61bbb514cc75..5327908e3684 100644 --- a/pkgs/by-name/ru/rustls-ffi/package.nix +++ b/pkgs/by-name/ru/rustls-ffi/package.nix @@ -16,19 +16,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "rustls-ffi"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "rustls"; repo = "rustls-ffi"; - rev = "v${finalAttrs.version}"; - hash = "sha256-ZKAyKcKwhnPE6PrfBFjLJKkTlGbdLcmW1EP/xSv2cpM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-m92kWH+J8wuGmI0msrp2aginY1K51iqgi3+u4ncmfts="; }; cargoDeps = rustPlatform.fetchCargoVendor { src = finalAttrs.src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-cZ92wSKoygt9x6O/ginOEiCiarlR5qGVFOHrIFdWOWE="; + hash = "sha256-gqc6en59QQpD14hOgRuGEPWLvrkyGn9tPR9vQmRAxIg="; }; propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ From 60c9120ec0fa7aada33f31ab4284db7e624c91a8 Mon Sep 17 00:00:00 2001 From: Jeremy Fleischman Date: Sat, 29 Mar 2025 10:21:15 -0500 Subject: [PATCH 010/165] cloudflare-dyndns: 5.0 -> 5.3 Explanation of changes: - v5.1 switched the build-system from poetry to hatchling: https://github.com/kissgyorgy/cloudflare-dyndns/commit/789d04264741e6ac67a6997c8d8107e30880a36a#diff-50c86b7ed8ac2cf95bd48334961bf0530cdc77b5a56f852c5c61b89d735fd711R9-R28 - v5.1 dropped the `cloudflare` and `requests` deps: https://github.com/kissgyorgy/cloudflare-dyndns/commit/f33dc466ea2c7aab81aae87190efdd4635cb9ad1 - v5.0 dropped the `attrs` dep: https://github.com/kissgyorgy/cloudflare-dyndns/commit/c95f1a2475774b51d926c57ec454f72d8b9b6144 --- pkgs/by-name/cl/cloudflare-dyndns/package.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/cl/cloudflare-dyndns/package.nix b/pkgs/by-name/cl/cloudflare-dyndns/package.nix index cf013c5d69ac..dcbfbb2b8f27 100644 --- a/pkgs/by-name/cl/cloudflare-dyndns/package.nix +++ b/pkgs/by-name/cl/cloudflare-dyndns/package.nix @@ -6,27 +6,24 @@ python3.pkgs.buildPythonApplication rec { pname = "cloudflare-dyndns"; - version = "5.0"; + version = "5.3"; pyproject = true; src = fetchFromGitHub { owner = "kissgyorgy"; repo = "cloudflare-dyndns"; rev = "v${version}"; - hash = "sha256-tI6qdNxIMEuAR+BcqsRi2EBXTQnfdDLKW7Y+fbcmlao="; + hash = "sha256-t0MqH9lDfl+cAnPYSG7P32OGO8Qpo1ep0Hj3Xl76lhU="; }; build-system = with python3.pkgs; [ - poetry-core + hatchling ]; dependencies = with python3.pkgs; [ - attrs click - cloudflare - pydantic - requests httpx + pydantic truststore ]; From ec004ef5f30f4ea66ce0b77bab5ce778883aff5d Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Tue, 1 Apr 2025 20:23:42 +0900 Subject: [PATCH 011/165] rpcs3: 0.0.34-17323-92d070729 -> 0.0.36-17736-c86a25079 --- pkgs/by-name/rp/rpcs3/package.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix index 779d9048ca0e..dc39a9bc61e3 100644 --- a/pkgs/by-name/rp/rpcs3/package.nix +++ b/pkgs/by-name/rp/rpcs3/package.nix @@ -21,12 +21,14 @@ python3, pugixml, flatbuffers, - llvm_16, + llvm_18, cubeb, + opencv, enableDiscordRpc ? false, faudioSupport ? true, faudio, SDL2, + sdl3, waylandSupport ? true, wayland, wrapGAppsHook3, @@ -34,10 +36,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "17323-92d070729"; - rpcs3Version = "0.0.34-17323-92d070729"; - rpcs3Revision = "92d07072915b99917892dd7833c06eb44a09e234"; - rpcs3Hash = "sha256-GH2sXw1AYdqwzxucXFhVS0nM0eRhC+XDHS6RTZY8pYY="; + rpcs3GitVersion = "17736-c86a25079"; + rpcs3Version = "0.0.36-17736-c86a25079"; + rpcs3Revision = "c86a25079518032d73395a79979970acb2581a91"; + rpcs3Hash = "sha256-e+mT3qn1oz1fh2bqu5YM+m774Can34If57Kd1T1EGbk="; inherit (qt6Packages) qtbase @@ -77,9 +79,11 @@ stdenv.mkDerivation { (lib.cmakeBool "USE_SYSTEM_CURL" true) (lib.cmakeBool "USE_SYSTEM_WOLFSSL" true) (lib.cmakeBool "USE_SYSTEM_FAUDIO" true) + (lib.cmakeBool "USE_SYSTEM_OPENAL" true) (lib.cmakeBool "USE_SYSTEM_PUGIXML" true) (lib.cmakeBool "USE_SYSTEM_FLATBUFFERS" true) (lib.cmakeBool "USE_SYSTEM_SDL" true) + (lib.cmakeBool "USE_SYSTEM_OPENCV" true) (lib.cmakeBool "USE_SDL" true) (lib.cmakeBool "WITH_LLVM" true) (lib.cmakeBool "BUILD_LLVM" false) @@ -115,10 +119,12 @@ stdenv.mkDerivation { wolfssl python3 pugixml - SDL2 + SDL2 # Still needed by FAudio's CMake + sdl3 flatbuffers - llvm_16 + llvm_18 libSM + opencv ] ++ cubeb.passthru.backendLibs ++ lib.optional faudioSupport faudio From 4e80d330dbd9f787f5315f8f5f8b61365f7958d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Apr 2025 14:42:21 +0000 Subject: [PATCH 012/165] camunda-modeler: 5.33.1 -> 5.34.0 --- pkgs/by-name/ca/camunda-modeler/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/camunda-modeler/package.nix b/pkgs/by-name/ca/camunda-modeler/package.nix index a6bf459dc75b..ee325407078c 100644 --- a/pkgs/by-name/ca/camunda-modeler/package.nix +++ b/pkgs/by-name/ca/camunda-modeler/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation rec { pname = "camunda-modeler"; - version = "5.33.1"; + version = "5.34.0"; src = fetchurl { url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz"; - hash = "sha256-YZSekLBjyADmBauGn5gonJ98bpW7ubHeKDS7J0IxsJo="; + hash = "sha256-3A8f371zyfx2GWJSwL0e+pD9M1Nitk4P7voq+V8Fojs="; }; sourceRoot = "camunda-modeler-${version}-linux-x64"; From 153e746e006adce51df7183c71c836887320c5ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20Merino=20Risue=C3=B1o?= Date: Tue, 8 Apr 2025 09:07:16 +0200 Subject: [PATCH 013/165] cartero: 0.1.5 -> 0.2.1 --- pkgs/by-name/ca/cartero/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cartero/package.nix b/pkgs/by-name/ca/cartero/package.nix index 8e866051a250..f0ad73d8a5cf 100644 --- a/pkgs/by-name/ca/cartero/package.nix +++ b/pkgs/by-name/ca/cartero/package.nix @@ -18,18 +18,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cartero"; - version = "0.1.5"; + version = "0.2.1"; src = fetchFromGitHub { owner = "danirod"; repo = "cartero"; tag = "v${finalAttrs.version}"; - hash = "sha256-1pSOyVGGl+G6mspdzzYP/BoQueVvAHTP6Vwqt6zL80c="; + hash = "sha256-EJhp/UQmD5Otf3n7wpd3s4oKt9g02q29tZA6bGKMQc8="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-qqxoP/T9de4w2wQJaCtQGRsoD+/dF7ir4iwYY69R+/I="; + hash = "sha256-szzQNFF+jMn7YLMjbmpM624T+qK0I++dNnZnJcPKZrw="; }; nativeBuildInputs = [ From 66bfff4792c06633c295cc30b11c7abeacaf6d34 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Tue, 8 Apr 2025 09:55:45 -0400 Subject: [PATCH 014/165] remmina: 1.4.39 -> 1.4.40 --- pkgs/applications/networking/remote/remmina/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 9020ea614166..14faf6c54cf9 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -51,13 +51,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "remmina"; - version = "1.4.39"; + version = "1.4.40"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${finalAttrs.version}"; - hash = "sha256-gsQtPa6NLQC3nMfemmZv416hyqFg8Z1GDMALhNaPAOw="; + hash = "sha256-AfZ9tWoaZTRs7GZOdli74e7/X/OMgbvfez9BipoZ/ng="; }; nativeBuildInputs = [ From aaaa035a994cf2947b52f31b193618c2d283cac3 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 29 Mar 2025 14:51:48 +0400 Subject: [PATCH 015/165] =?UTF-8?q?nanomq:=200.22.1=20=E2=86=92=200.23.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/na/nanomq/package.nix | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/na/nanomq/package.nix b/pkgs/by-name/na/nanomq/package.nix index a67679dffd47..772d30ce40a2 100644 --- a/pkgs/by-name/na/nanomq/package.nix +++ b/pkgs/by-name/na/nanomq/package.nix @@ -49,21 +49,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nanomq"; - version = "0.22.1"; + version = "0.23.6"; src = fetchFromGitHub { owner = "emqx"; repo = "nanomq"; - rev = finalAttrs.version; - hash = "sha256-aB1gEzo2dX8NY+e0Dq4ELgkUpL/NtvvuY/l539BPIng="; + tag = finalAttrs.version; + hash = "sha256-Fy/9ASpQ/PHGItYhad69DdHWqCr/Wa+Xdm53Q573Pfc="; fetchSubmodules = true; }; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "DESTINATION /etc" "DESTINATION $out/etc" - ''; - nativeBuildInputs = [ cmake ninja @@ -90,8 +85,6 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "NNG_ENABLE_TLS" true) ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=int-conversion"; - # disabled by default - not 100% reliable and making nanomq depend on # mosquitto would annoy people doInstallCheck = false; @@ -133,11 +126,11 @@ stdenv.mkDerivation (finalAttrs: { }); }; - meta = with lib; { + meta = { description = "Ultra-lightweight and blazing-fast MQTT broker for IoT edge"; homepage = "https://nanomq.io/"; - license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sikmir ]; + platforms = lib.platforms.unix; }; }) From bfa357fa7cd4578b34e8aa9d6a45009800730ef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 10 Apr 2025 19:33:09 +0200 Subject: [PATCH 016/165] cargo-geiger: 0.11.7 -> 0.12.0 --- .../ca/cargo-geiger/allow-warnings.patch | 12 ----- .../fix-build-with-rust-1.80.patch | 48 ------------------- pkgs/by-name/ca/cargo-geiger/package.nix | 19 ++------ 3 files changed, 5 insertions(+), 74 deletions(-) delete mode 100644 pkgs/by-name/ca/cargo-geiger/allow-warnings.patch delete mode 100644 pkgs/by-name/ca/cargo-geiger/fix-build-with-rust-1.80.patch diff --git a/pkgs/by-name/ca/cargo-geiger/allow-warnings.patch b/pkgs/by-name/ca/cargo-geiger/allow-warnings.patch deleted file mode 100644 index 97a9090e904d..000000000000 --- a/pkgs/by-name/ca/cargo-geiger/allow-warnings.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cargo-geiger/src/lib.rs b/cargo-geiger/src/lib.rs -index cc08146..d220ad9 100644 ---- a/cargo-geiger/src/lib.rs -+++ b/cargo-geiger/src/lib.rs -@@ -5,7 +5,6 @@ - #![deny(clippy::cargo)] - #![deny(clippy::doc_markdown)] - #![forbid(unsafe_code)] --#![deny(warnings)] - - /// Argument parsing - pub mod args; diff --git a/pkgs/by-name/ca/cargo-geiger/fix-build-with-rust-1.80.patch b/pkgs/by-name/ca/cargo-geiger/fix-build-with-rust-1.80.patch deleted file mode 100644 index 37d9c2ebad38..000000000000 --- a/pkgs/by-name/ca/cargo-geiger/fix-build-with-rust-1.80.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 48c5606f..4c796675 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -2238,6 +2238,12 @@ dependencies = [ - "winapi", - ] - -+[[package]] -+name = "num-conv" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -+ - [[package]] - name = "num-traits" - version = "0.2.17" -@@ -3148,13 +3154,14 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.30" -+version = "0.3.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" - dependencies = [ - "deranged", - "itoa", - "libc", -+ "num-conv", - "num_threads", - "powerfmt", - "serde", -@@ -3170,10 +3177,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.15" -+version = "0.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" - dependencies = [ -+ "num-conv", - "time-core", - ] - diff --git a/pkgs/by-name/ca/cargo-geiger/package.nix b/pkgs/by-name/ca/cargo-geiger/package.nix index edfa3438a50d..4adfd0a0c3c5 100644 --- a/pkgs/by-name/ca/cargo-geiger/package.nix +++ b/pkgs/by-name/ca/cargo-geiger/package.nix @@ -13,26 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-geiger"; - version = "0.11.7"; + version = "0.12.0"; src = fetchFromGitHub { - owner = "rust-secure-code"; + owner = "geiger-rs"; repo = "cargo-geiger"; - rev = "cargo-geiger@v${version}"; - hash = "sha256-/5yuayqneZV6aVQ6YFgqNS2XY3W6yETRQ0kE5ovc7p8="; + tag = "cargo-geiger-${version}"; + hash = "sha256-OW/LOZUCGOIl7jeWnzt4SXTo3gplJx/wbC21S1TdZx0="; }; - cargoPatches = [ - # https://github.com/geiger-rs/cargo-geiger/pull/528 - ./fix-build-with-rust-1.80.patch - ]; - useFetchCargoVendor = true; - cargoHash = "sha256-n6RfulzrK9QebC1tgVVd/YnBc21Jf0OSfHApRO1c0ew="; - - patches = [ - ./allow-warnings.patch - ]; + cargoHash = "sha256-aDgpEfX0QRkQD6c4ant6uSN18WLHVnZISRr7lyu9IzA="; buildInputs = [ openssl ] From ff773dccc37eeaf6c4b36f5a60cb7de197e7a1ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 10 Apr 2025 21:30:06 +0200 Subject: [PATCH 017/165] cargo-geiger: fix some tests --- pkgs/by-name/ca/cargo-geiger/package.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ca/cargo-geiger/package.nix b/pkgs/by-name/ca/cargo-geiger/package.nix index 4adfd0a0c3c5..efdc49e8fbfa 100644 --- a/pkgs/by-name/ca/cargo-geiger/package.nix +++ b/pkgs/by-name/ca/cargo-geiger/package.nix @@ -41,22 +41,24 @@ rustPlatform.buildRustPackage rec { # curl-sys wants to run curl-config on darwin ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl.dev ]; - # skip tests with networking or other failures + preCheck = '' + export HOME=$(mktemp -d) + ''; + checkFlags = [ - "--skip serialize_test1_quick_report" + # panics "--skip serialize_test2_quick_report" "--skip serialize_test3_quick_report" - "--skip serialize_test4_quick_report" "--skip serialize_test6_quick_report" - "--skip serialize_test7_quick_report" - "--skip serialize_test1_report" "--skip serialize_test2_report" "--skip serialize_test3_report" - "--skip serialize_test4_report" "--skip serialize_test6_report" - "--skip serialize_test7_report" - # multiple test cases that time-out or cause memory leaks - "--skip test_package" + # requires networking + "--skip test_package::case_2" + "--skip test_package::case_3" + "--skip test_package::case_6" + "--skip test_package::case_9" + # panics, snapshot assertions fails "--skip test_package_update_readme::case_2" "--skip test_package_update_readme::case_3" "--skip test_package_update_readme::case_5" From 7834b38cc49dfbc581e6ad40661e4804a3f81bea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 11 Apr 2025 10:58:05 +0200 Subject: [PATCH 018/165] cargo-geiger: update meta attrs, remove `with lib;` --- pkgs/by-name/ca/cargo-geiger/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ca/cargo-geiger/package.nix b/pkgs/by-name/ca/cargo-geiger/package.nix index efdc49e8fbfa..28f893e944b2 100644 --- a/pkgs/by-name/ca/cargo-geiger/package.nix +++ b/pkgs/by-name/ca/cargo-geiger/package.nix @@ -64,22 +64,22 @@ rustPlatform.buildRustPackage rec { "--skip test_package_update_readme::case_5" ]; - meta = with lib; { - homepage = "https://github.com/rust-secure-code/cargo-geiger"; - changelog = "https://github.com/rust-secure-code/cargo-geiger/blob/cargo-geiger-${version}/CHANGELOG.md"; + meta = { description = "Detects usage of unsafe Rust in a Rust crate and its dependencies"; - mainProgram = "cargo-geiger"; longDescription = '' A cargo plugin that detects the usage of unsafe Rust in a Rust crate and its dependencies. It provides information to aid auditing and guide dependency selection but it can not help you decide when and why unsafe code is appropriate. ''; - license = with licenses; [ + homepage = "https://github.com/geiger-rs/cargo-geiger"; + changelog = "https://github.com/geiger-rs/cargo-geiger/blob/cargo-geiger-${version}/CHANGELOG.md"; + mainProgram = "cargo-geiger"; + license = with lib.licenses; [ asl20 # or mit ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ evanjs gepbird jk From 48269b3334b541866bb354cc27445c89466ce30f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 11 Apr 2025 11:08:59 +0200 Subject: [PATCH 019/165] cargo-geiger: migrate to new apple sdk --- pkgs/by-name/ca/cargo-geiger/package.nix | 27 ++++++------------------ 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/ca/cargo-geiger/package.nix b/pkgs/by-name/ca/cargo-geiger/package.nix index 28f893e944b2..57be3f86c461 100644 --- a/pkgs/by-name/ca/cargo-geiger/package.nix +++ b/pkgs/by-name/ca/cargo-geiger/package.nix @@ -1,14 +1,9 @@ { - stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, - # darwin dependencies - darwin, - libiconv, - curl, }: rustPlatform.buildRustPackage rec { @@ -25,21 +20,13 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-aDgpEfX0QRkQD6c4ant6uSN18WLHVnZISRr7lyu9IzA="; - buildInputs = - [ openssl ] - ++ lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - CoreFoundation - Security - libiconv - curl - ] - ); - nativeBuildInputs = - [ pkg-config ] - # curl-sys wants to run curl-config on darwin - ++ lib.optionals stdenv.hostPlatform.isDarwin [ curl.dev ]; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; preCheck = '' export HOME=$(mktemp -d) From 41ff65d89b1852f10cf95f5a75c865968287f1df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 11 Apr 2025 11:38:44 +0200 Subject: [PATCH 020/165] cargo-geiger: add version test --- pkgs/by-name/ca/cargo-geiger/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/ca/cargo-geiger/package.nix b/pkgs/by-name/ca/cargo-geiger/package.nix index 57be3f86c461..e0cff456712a 100644 --- a/pkgs/by-name/ca/cargo-geiger/package.nix +++ b/pkgs/by-name/ca/cargo-geiger/package.nix @@ -4,6 +4,9 @@ rustPlatform, pkg-config, openssl, + # testing + testers, + cargo-geiger, }: rustPlatform.buildRustPackage rec { @@ -51,6 +54,10 @@ rustPlatform.buildRustPackage rec { "--skip test_package_update_readme::case_5" ]; + passthru.tests.version = testers.testVersion { + package = cargo-geiger; + }; + meta = { description = "Detects usage of unsafe Rust in a Rust crate and its dependencies"; longDescription = '' From c716e43cf4f737357a08ba7661fabe81b0c24c95 Mon Sep 17 00:00:00 2001 From: andre4ik3 Date: Mon, 6 Jan 2025 03:13:42 +0400 Subject: [PATCH 021/165] apparency: 2.0 -> 2.2 In addition, added andre4ik3 as maintainer and changed description to be more informative. --- pkgs/by-name/ap/apparency/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ap/apparency/package.nix b/pkgs/by-name/ap/apparency/package.nix index 7eacc1aa7da6..216ea055a97b 100644 --- a/pkgs/by-name/ap/apparency/package.nix +++ b/pkgs/by-name/ap/apparency/package.nix @@ -6,17 +6,17 @@ }: let - snapshot = "20240601172844"; + snapshot = "20250105225747"; in stdenv.mkDerivation { pname = "apparency"; - version = "2.0"; + version = "2.2"; src = fetchurl { # Use externally archived download URL because # upstream does not provide stable URLs for versioned releases url = "https://web.archive.org/web/${snapshot}/https://www.mothersruin.com/software/downloads/Apparency.dmg"; - hash = "sha256-XKxWxqfxy9AQneILLrN9XqLt4/k2N8yumZ5mrSvczFk="; + hash = "sha256-nktNbyJOXDydQPwb43Uq3nQv65XcwrqZTKu5OCcLyfU="; }; nativeBuildInputs = [ undmg ]; @@ -34,10 +34,10 @@ stdenv.mkDerivation { ''; meta = { - description = "App That Opens Apps"; + description = "Toolkit for analysing macOS applications"; homepage = "https://www.mothersruin.com/software/Apparency/"; license = lib.licenses.unfreeRedistributable; - maintainers = [ ]; + maintainers = with lib.maintainers; [ andre4ik3 ]; mainProgram = "appy"; platforms = lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; From e2c7748a167c30a3c6a9534a11786a079e4d8350 Mon Sep 17 00:00:00 2001 From: emaryn Date: Thu, 13 Mar 2025 03:25:02 +0800 Subject: [PATCH 022/165] wla-dx: 9.11 -> 10.6 --- pkgs/by-name/wl/wla-dx/package.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/wl/wla-dx/package.nix b/pkgs/by-name/wl/wla-dx/package.nix index c0e871b853b0..317bd36b00dc 100644 --- a/pkgs/by-name/wl/wla-dx/package.nix +++ b/pkgs/by-name/wl/wla-dx/package.nix @@ -7,27 +7,31 @@ stdenv.mkDerivation rec { pname = "wla-dx"; - version = "9.11"; + version = "10.6"; src = fetchFromGitHub { owner = "vhelin"; repo = "wla-dx"; - rev = "v${version}-fix"; - sha256 = "0sz1vqafl7ii3z1710sk0ilvczv8pb4b6lkmg9pr7hqj3kaxndii"; + tag = "v${version}"; + hash = "sha256-t+X1Y1NhAGi4NOPik2fuLZAR3A7NQMAkSgWvqAFaIik="; }; installPhase = '' + runHook preInstall + mkdir -p $out/bin install binaries/* $out/bin + + runHook postInstall ''; nativeBuildInputs = [ cmake ]; - meta = with lib; { + meta = { homepage = "https://www.villehelin.com/wla.html"; description = "Yet Another GB-Z80/Z80/6502/65C02/6510/65816/HUC6280/SPC-700 Multi Platform Cross Assembler Package"; - license = licenses.gpl2; - maintainers = with maintainers; [ matthewbauer ]; - platforms = platforms.all; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ matthewbauer ]; + platforms = lib.platforms.all; }; } From 327a23515dc93d9fbc4b6042b88dd566304bc098 Mon Sep 17 00:00:00 2001 From: patka Date: Sat, 12 Apr 2025 09:54:22 +0200 Subject: [PATCH 023/165] ettercap: upgrade pcre to pcre2 Related to: https://github.com/NixOS/nixpkgs/issues/356387. pcre2 support for ettercap is implemented in this PR: https://github.com/Ettercap/ettercap/pull/1170 --- pkgs/by-name/et/ettercap/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/et/ettercap/package.nix b/pkgs/by-name/et/ettercap/package.nix index 29d558b35896..8bd47cd8f085 100644 --- a/pkgs/by-name/et/ettercap/package.nix +++ b/pkgs/by-name/et/ettercap/package.nix @@ -8,7 +8,7 @@ libnet, zlib, curl, - pcre, + pcre2, openssl, ncurses, glib, @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { libnet zlib curl - pcre + pcre2 openssl ncurses glib From b301c11376be9ddccaf6335802cdb84d82a6ea57 Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 15 Apr 2025 04:41:15 +0800 Subject: [PATCH 024/165] ain: 1.4.1 -> 1.6.0 --- pkgs/by-name/ai/ain/package.nix | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ai/ain/package.nix b/pkgs/by-name/ai/ain/package.nix index 3b6d29815fc9..22b8ca8b173e 100644 --- a/pkgs/by-name/ai/ain/package.nix +++ b/pkgs/by-name/ai/ain/package.nix @@ -4,31 +4,34 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "ain"; - version = "1.4.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "jonaslu"; repo = "ain"; - rev = "v${version}"; - hash = "sha256-JEavBPnF3WW6oCZ1OC8g1dZev4qC7bi74/q2nvXK3mo="; + tag = "v${finalAttrs.version}"; + hash = "sha256-jZTdFA3ZNb0xIN7+ne5bz6jMpj4jqZ/JHxz2x83fBm8="; }; - vendorHash = "sha256-+72Y8SKvx7KBK5AIBWKlDqQYpHnZc9CNxCdo4yakPb0="; + vendorHash = "sha256-VLn7JPYYFmQ/9c0zKHWJBqtxwCbWgsN4FHlXrQiKMj4="; ldflags = [ "-s" "-w" - "-X=main.gitSha=${src.rev}" + "-X=main.gitSha=${finalAttrs.src.tag}" ]; - meta = with lib; { + # need network + doCheck = false; + + meta = { description = "HTTP API client for the terminal"; homepage = "https://github.com/jonaslu/ain"; - changelog = "https://github.com/jonaslu/ain/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + changelog = "https://github.com/jonaslu/ain/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "ain"; }; -} +}) From a7a3b2402681f53113b738c61e80e9bd7c6b77c5 Mon Sep 17 00:00:00 2001 From: emaryn Date: Wed, 16 Apr 2025 03:42:55 +0800 Subject: [PATCH 025/165] aptly: 1.5.0 -> 1.6.1 --- pkgs/by-name/ap/aptly/package.nix | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ap/aptly/package.nix b/pkgs/by-name/ap/aptly/package.nix index f04824a05fb3..2be2908a7020 100644 --- a/pkgs/by-name/ap/aptly/package.nix +++ b/pkgs/by-name/ap/aptly/package.nix @@ -12,18 +12,18 @@ aptly, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "aptly"; - version = "1.5.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "aptly-dev"; repo = "aptly"; - rev = "v${version}"; - sha256 = "sha256-LqGOLXXaGfQfoj2r+aY9SdOKUDI9+22EsHKBhHMidyk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-oGogOK0oQTdmlQUrIOo2BT/8wEk9kZ3mJbj0K5s9tiU="; }; - vendorHash = "sha256-6l3OFKFTtFWT68Ylav6woczBlMhD75C9ZoQ6OeLz0Cs="; + vendorHash = "sha256-4z0JFC+Cz72e48ygfgA4DYJVkpInPIyA5yh//eedt8Q="; nativeBuildInputs = [ installShellFiles @@ -33,21 +33,24 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X main.Version=${version}" ]; + preBuild = '' + echo ${finalAttrs.version} > VERSION + ''; + postInstall = '' installShellCompletion --bash --name aptly completion.d/aptly installShellCompletion --zsh --name _aptly completion.d/_aptly - wrapProgram "$out/bin/aptly" \ - --prefix PATH ":" "${ + wrapProgram $out/bin/aptly \ + --prefix PATH : ${ lib.makeBinPath [ gnupg bzip2 xz graphviz ] - }" + } ''; doCheck = false; @@ -57,12 +60,12 @@ buildGoModule rec { command = "aptly version"; }; - meta = with lib; { + meta = { homepage = "https://www.aptly.info"; description = "Debian repository management tool"; - license = licenses.mit; - maintainers = with maintainers; [ montag451 ] ++ teams.bitnomial.members; - changelog = "https://github.com/aptly-dev/aptly/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.montag451 ] ++ lib.teams.bitnomial.members; + changelog = "https://github.com/aptly-dev/aptly/releases/tag/v${finalAttrs.version}"; mainProgram = "aptly"; }; -} +}) From 961d000391f7d79c1921bc54b9cd98ad99e924e5 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Wed, 16 Apr 2025 21:07:04 +0200 Subject: [PATCH 026/165] nix-du: 1.2.2 -> 1.2.3 Diff: https://github.com/symphorien/nix-du/compare/refs/tags/v1.2.2...v1.2.3 Changelog: https://github.com/symphorien/nix-du/blob/v1.2.3/CHANGELOG.md --- pkgs/tools/package-management/nix-du/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index 369eec6c9f88..86452c61bc23 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "nix-du"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "symphorien"; repo = "nix-du"; tag = "v${version}"; - hash = "sha256-RkGPXjog2XR3ISlWMQZ1rzy3SwE5IPAKP09FIZ6LwkM="; + hash = "sha256-/Afp0InA/0xXdombAzylYJF9wcv5WwYizVsP+fHTDrM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-rrBFgE3Tz68gBQbz006RSdsqacSZqON78NM4FNi+wrk="; + cargoHash = "sha256-Q/woxGh1I6FpgJ5D0x7KovSwuRXfZzqjzwljaoKj0/Y="; doCheck = true; nativeCheckInputs = [ From f0efcd230bb5c5b906b1d2e85ef78bafbbe383f7 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Thu, 3 Apr 2025 14:20:05 -0700 Subject: [PATCH 027/165] kamid: unbreak on gcc 14, modernize --- pkgs/by-name/ka/kamid/package.nix | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ka/kamid/package.nix b/pkgs/by-name/ka/kamid/package.nix index 0b8924270b05..ff185348afc8 100644 --- a/pkgs/by-name/ka/kamid/package.nix +++ b/pkgs/by-name/ka/kamid/package.nix @@ -1,20 +1,20 @@ { - stdenv, lib, + stdenv, + fetchurl, pkg-config, libevent, libressl, - libbsd, - fetchurl, readline, + libbsd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kamid"; version = "0.2"; src = fetchurl { - url = "https://github.com/omar-polo/kamid/releases/download/${version}/${pname}-${version}.tar.gz"; + url = "https://github.com/omar-polo/kamid/releases/download/${finalAttrs.version}/kamid-${finalAttrs.version}.tar.gz"; sha256 = "sha256-23LgcZ+R6wcUz1fZA+IbhyshfQOTyiFPZ+uKVwOh680="; }; @@ -29,13 +29,20 @@ stdenv.mkDerivation rec { libbsd ]; + env.NIX_CFLAGS_COMPILE = toString [ + # client.c:381:13: error: implicit declaration of function 'setgroups'; did you mean 'getgroups'? + "-Wno-error=implicit-function-declaration" + # ftp.c:1585:22: error: passing argument 1 of 'log_procinit' makes pointer from integer without a cast + "-Wno-error=int-conversion" + ]; + makeFlags = [ "AR:=$(AR)" ]; - meta = with lib; { + meta = { description = "FREE, easy-to-use and portable implementation of a 9p file server daemon for UNIX-like systems"; homepage = "https://kamid.omarpolo.com"; - license = licenses.isc; - maintainers = with maintainers; [ heph2 ]; - platforms = platforms.linux; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ heph2 ]; + platforms = lib.platforms.linux; }; -} +}) From 68daf88104376bd647de83956adc8a11144f4e17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Apr 2025 14:22:23 +0000 Subject: [PATCH 028/165] papermc: 1.21.4-224 -> 1.21.5-22 --- pkgs/games/papermc/versions.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/games/papermc/versions.json b/pkgs/games/papermc/versions.json index 6ba9ff046c99..5814b7ceca0b 100644 --- a/pkgs/games/papermc/versions.json +++ b/pkgs/games/papermc/versions.json @@ -68,7 +68,11 @@ "version": "1.21.3-83" }, "1.21.4": { - "hash": "sha256-DN5RmWlReUorNF95au0FBuWuDeslqwhDGWf2NkTihxc=", - "version": "1.21.4-224" + "hash": "sha256-4uzalgJxiz/KXYKTlmJSYRXoUab3BPTOasWmU6VX53M=", + "version": "1.21.4-226" + }, + "1.21.5": { + "hash": "sha256-qV6l8ZhHEtGt1/weX+xlL7mohGKF5cjImvWfKINUidg=", + "version": "1.21.5-22" } } From 7ced411dd6a2ff287623b16e3ece0c1b0fdcaebe Mon Sep 17 00:00:00 2001 From: mksafavi Date: Fri, 18 Apr 2025 21:50:59 +0330 Subject: [PATCH 029/165] mpvScripts.uosc: 5.6.2 -> 5.8.0 --- pkgs/applications/video/mpv/scripts/uosc.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/uosc.nix b/pkgs/applications/video/mpv/scripts/uosc.nix index 2838dd5e4942..4d3078f89bc8 100644 --- a/pkgs/applications/video/mpv/scripts/uosc.nix +++ b/pkgs/applications/video/mpv/scripts/uosc.nix @@ -9,21 +9,21 @@ buildLua (finalAttrs: { pname = "uosc"; - version = "5.6.2"; + version = "5.8.0"; scriptPath = "src/uosc"; src = fetchFromGitHub { owner = "tomasklaen"; repo = "uosc"; rev = finalAttrs.version; - hash = "sha256-UbSEJGlLSX5wZpfj+Cb3LfWw17pnjxIJUNtP8dclKoU="; + hash = "sha256-O8GLYsFoDQmYvHWLwfWo1zcQvCsV2RqAe/m+R5cOITI="; }; passthru.updateScript = gitUpdater { }; tools = buildGoModule { pname = "uosc-bin"; inherit (finalAttrs) version src; - vendorHash = "sha256-nkY0z2GiDxfNs98dpe+wZNI3dAXcuHaD/nHiZ2XnZ1Y="; + vendorHash = "sha256-oRXChHeVQj6nXvKOVV125sM8wD33Dxxv0r/S7sl6SxQ="; }; # the script uses custom "texture" fonts as the background for ui elements. From 9b9869eb741782818f53509c0a33e38242542526 Mon Sep 17 00:00:00 2001 From: viserctul Date: Thu, 13 Mar 2025 21:51:07 +0100 Subject: [PATCH 030/165] rustdesk-flutter: add xdg-user-dir to PATH --- pkgs/by-name/ru/rustdesk-flutter/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix index 643945b4e574..3ddcf5ad02b8 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/package.nix +++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix @@ -24,6 +24,7 @@ rustc, rustfmt, xdotool, + xdg-user-dirs, pipewire, cargo-expand, yq, @@ -205,6 +206,10 @@ flutter.buildFlutterApplication rec { cp ../res/scalable.svg $out/share/icons/hicolor/scalable/apps/rustdesk.svg ''; + extraWrapProgramArgs = '' + --prefix PATH : ${lib.makeBinPath [ xdg-user-dirs ]} + ''; + desktopItems = [ (makeDesktopItem { name = "rustdesk"; From 14126b336b217f7bd528a40910b894d950e3b7d0 Mon Sep 17 00:00:00 2001 From: emaryn Date: Sat, 19 Apr 2025 07:01:43 +0800 Subject: [PATCH 031/165] chunkfs: 0.7 -> 0.8 --- pkgs/by-name/ch/chunkfs/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ch/chunkfs/package.nix b/pkgs/by-name/ch/chunkfs/package.nix index 60efcdf47667..5b7dd92b1745 100644 --- a/pkgs/by-name/ch/chunkfs/package.nix +++ b/pkgs/by-name/ch/chunkfs/package.nix @@ -6,13 +6,13 @@ fuse, }: -stdenv.mkDerivation rec { - version = "0.7"; +stdenv.mkDerivation (finalAttrs: { pname = "chunkfs"; + version = "0.8"; src = fetchurl { - url = "https://chunkfs.florz.de/chunkfs_${version}.tar.gz"; - sha256 = "4c168fc2b265a6ba34afc565707ea738f34375325763c0596f2cfa1c9b8d40f1"; + url = "https://chunkfs.florz.de/chunkfs_${finalAttrs.version}.tar.xz"; + hash = "sha256-HFv51ta2eNW9Qt9CUp2oTTlC8Lpwc1XKR/uYzMDfd88="; }; buildInputs = [ @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { meta = { description = "FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa"; - homepage = "http://chunkfs.florz.de/"; + homepage = "http://chunkfs.florz.de"; license = lib.licenses.gpl2Plus; - platforms = with lib.platforms; linux; + platforms = lib.platforms.linux; }; -} +}) From ded65798a7f38eb61d406b4e067d1d9e554b8925 Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Sat, 19 Apr 2025 01:25:13 +0200 Subject: [PATCH 032/165] mpvScripts.buildLua: fix buildLua's runtime-dependencies argument Fix buildLua's runtime-dependencies argument to prevent the following nasty error, introduced in commit e67cceafda6d ("mpvScripts.twitch-chat: refactor using buildLua's `runtime-dependencies`"): error: expected a list but found a set: { [...] } Fixes: e2596ac22d42 ("mpvScripts.buildLua: add a `runtime-dependencies` option") --- pkgs/applications/video/mpv/scripts/buildLua.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/buildLua.nix b/pkgs/applications/video/mpv/scripts/buildLua.nix index 822950ffc9b7..b21df5478a3e 100644 --- a/pkgs/applications/video/mpv/scripts/buildLua.nix +++ b/pkgs/applications/video/mpv/scripts/buildLua.nix @@ -81,14 +81,12 @@ lib.makeOverridable ( inherit scriptName; } // lib.optionalAttrs (runtime-dependencies != [ ]) { - extraWrapperArgs = - [ - "--prefix" - "PATH" - ":" - ] - ++ (map lib.makeBinPath runtime-dependencies) - ++ args.passthru.extraWrapperArgs or [ ]; + extraWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath runtime-dependencies) + ] ++ args.passthru.extraWrapperArgs or [ ]; }; meta = { From 313f3eab89651951ad13f44c23d0bd98e448a667 Mon Sep 17 00:00:00 2001 From: t4ccer Date: Fri, 18 Apr 2025 18:35:03 -0600 Subject: [PATCH 033/165] ncbi-vdb: 3.1.1 -> 3.2.1 --- pkgs/by-name/nc/ncbi-vdb/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nc/ncbi-vdb/package.nix b/pkgs/by-name/nc/ncbi-vdb/package.nix index 1424b3fb81a2..5e8348db74f1 100644 --- a/pkgs/by-name/nc/ncbi-vdb/package.nix +++ b/pkgs/by-name/nc/ncbi-vdb/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ncbi-vdb"; - version = "3.1.1"; + version = "3.2.1"; src = fetchFromGitHub { owner = "ncbi"; repo = "ncbi-vdb"; tag = finalAttrs.version; - hash = "sha256-HBiheN8XfYYwmY5gw7j8qTczn6WZZNTzY2/fGtpgs/8="; + hash = "sha256-ccKJF6Ank/hyADnDwN0qoQbb0BniXlz/Fgnc1IXq0P0="; }; nativeBuildInputs = [ From ceb58c840ca8f13e0d9a2a32397855e0d670b42e Mon Sep 17 00:00:00 2001 From: t4ccer Date: Fri, 18 Apr 2025 18:35:12 -0600 Subject: [PATCH 034/165] sratoolkit: 3.1.1 -> 3.2.1 --- pkgs/by-name/sr/sratoolkit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sr/sratoolkit/package.nix b/pkgs/by-name/sr/sratoolkit/package.nix index d244acdfd0d2..fa7bd2f17c40 100644 --- a/pkgs/by-name/sr/sratoolkit/package.nix +++ b/pkgs/by-name/sr/sratoolkit/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sratoolkit"; # NOTE: When updating make sure to update ncbi-vdb as well for versions to match - version = "3.1.1"; + version = "3.2.1"; src = fetchFromGitHub { owner = "ncbi"; repo = "sra-tools"; tag = finalAttrs.version; - hash = "sha256-WVPiAz3EFYuhBnl7BsEjJ2BTi1wAownEunVM4sdLaj8="; + hash = "sha256-OeM4syv9c1rZn2ferrhXyKJu68ywVYwnHoqnviWBZy4="; }; cmakeFlags = [ From 56f4097598b502ad9f2f53d2d68735d6283e870e Mon Sep 17 00:00:00 2001 From: emaryn Date: Sat, 19 Apr 2025 10:10:57 +0800 Subject: [PATCH 035/165] clickup: 3.3.79 -> 3.5.87 --- pkgs/by-name/cl/clickup/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/clickup/package.nix b/pkgs/by-name/cl/clickup/package.nix index e0d2a9e8b4c3..4d1ec6b6030b 100644 --- a/pkgs/by-name/cl/clickup/package.nix +++ b/pkgs/by-name/cl/clickup/package.nix @@ -7,12 +7,12 @@ }: let pname = "clickup"; - version = "3.3.79"; + version = "3.5.87"; src = fetchurl { # Using archive.org because the website doesn't store older versions of the software. - url = "https://web.archive.org/web/20240601173958/https%3A%2F%2Fdesktop.clickup.com%2Flinux"; - hash = "sha256-jAOYDX9j+ZTqWsSg0rEckKZnErgsIV6+CtUv3M3wNqM="; + url = "https://web.archive.org/web/20250419020454/https://desktop.clickup.com/linux"; + hash = "sha256-+Et+N8ZR5pJ8dvsU/tZa+LLpatooTnq3D24c6t1NS18="; }; appimage = appimageTools.wrapType2 { From b99328646beb240c28dca58e2b0e29d26be57039 Mon Sep 17 00:00:00 2001 From: Maxim Schuwalow Date: Sat, 19 Apr 2025 14:41:29 +0200 Subject: [PATCH 036/165] async-profiler: 3.0 -> 4.0 --- pkgs/by-name/as/async-profiler/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/as/async-profiler/package.nix b/pkgs/by-name/as/async-profiler/package.nix index e82ebcd62f22..44737209b9af 100644 --- a/pkgs/by-name/as/async-profiler/package.nix +++ b/pkgs/by-name/as/async-profiler/package.nix @@ -4,16 +4,17 @@ fetchFromGitHub, jdk, makeWrapper, + nix-update-script, }: stdenv.mkDerivation rec { pname = "async-profiler"; - version = "3.0"; + version = "4.0"; src = fetchFromGitHub { owner = "jvm-profiling-tools"; repo = "async-profiler"; rev = "v${version}"; - hash = "sha256-0CCJoRjRLq4LpiRD0ibzK8So9qSQymePCTYUI60Oy2k="; + hash = "sha256-4S5Lbhqu2V7TzrbFf3G3G4OEYLU6w5lcgUl49k9YqSA="; }; nativeBuildInputs = [ makeWrapper ]; @@ -35,6 +36,8 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/async-profiler --prefix PATH : ${lib.makeBinPath [ jdk ]} ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Low overhead sampling profiler for Java that does not suffer from Safepoint bias problem"; homepage = "https://github.com/jvm-profiling-tools/async-profiler"; From 517c697aeedd780610a7f4132bbb2a83ebd61b08 Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Sat, 19 Apr 2025 15:46:51 +0200 Subject: [PATCH 037/165] mautrix-discord: 0.7.2 -> 0.7.3 --- pkgs/by-name/ma/mautrix-discord/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mautrix-discord/package.nix b/pkgs/by-name/ma/mautrix-discord/package.nix index b3943084ca55..79d75916b882 100644 --- a/pkgs/by-name/ma/mautrix-discord/package.nix +++ b/pkgs/by-name/ma/mautrix-discord/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "mautrix-discord"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "mautrix"; repo = "discord"; rev = "v${version}"; - hash = "sha256-KRfbxPblOL4JznnGx9Jj5XXEWEKzan5xWvAwYmP7yGc="; + hash = "sha256-q6FpeGWoeIVVeomKMHpXUntMWsMJMV73FDiBfbMQ6Oc="; }; - vendorHash = "sha256-8SW2q4Svfe8X9qwzYBa5HhHyQZDsPJqig/V1/Wp+avo="; + vendorHash = "sha256-6R5ryzjAAAI3YtTMlHjrLOXkid2kCe8+ZICnNUjtxaQ="; ldflags = [ "-s" From da0984f876504a0a2e7f62634308a88266e579ed Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Sat, 19 Apr 2025 15:48:17 +0200 Subject: [PATCH 038/165] mautrix-meta: 0.4.5 -> 0.4.6 --- pkgs/by-name/ma/mautrix-meta/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix index 928d67fbe8b7..dc6153bab418 100644 --- a/pkgs/by-name/ma/mautrix-meta/package.nix +++ b/pkgs/by-name/ma/mautrix-meta/package.nix @@ -15,7 +15,7 @@ buildGoModule rec { pname = "mautrix-meta"; - version = "0.4.5"; + version = "0.4.6"; subPackages = [ "cmd/mautrix-meta" ]; @@ -23,13 +23,13 @@ buildGoModule rec { owner = "mautrix"; repo = "meta"; rev = "v${version}"; - hash = "sha256-UWW5h4e6usxVkMH1TDGt62/ThlAhbeqivnYFIKPOqXE="; + hash = "sha256-FRK32NBtAro/+StacBa/jMg31xkxOKx791RBmuG61z8="; }; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; - vendorHash = "sha256-fJuCNhbm6930zPyfXA8mbjyJmRdv0Zn0ZZ+ULImXjKU="; + vendorHash = "sha256-nFxWPMNV0La21W03WNDZNktcHYLFVzPY/SkAyp0AVxs="; passthru = { tests = { From 427e5ee4c4fe25b609a1820e8ccff2c02bb63fa0 Mon Sep 17 00:00:00 2001 From: SchweGELBin Date: Sat, 19 Apr 2025 15:50:22 +0200 Subject: [PATCH 039/165] mautrix-slack: 0.2.0 -> 0.2.1 --- pkgs/by-name/ma/mautrix-slack/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mautrix-slack/package.nix b/pkgs/by-name/ma/mautrix-slack/package.nix index c81c36bf00c0..f1d893ee18bd 100644 --- a/pkgs/by-name/ma/mautrix-slack/package.nix +++ b/pkgs/by-name/ma/mautrix-slack/package.nix @@ -13,7 +13,7 @@ withGoolm ? false, }: let - version = "0.2.0"; + version = "0.2.1"; in buildGoModule { pname = "mautrix-slack"; @@ -23,10 +23,10 @@ buildGoModule { owner = "mautrix"; repo = "slack"; tag = "v${version}"; - hash = "sha256-y6DsojQQAQkAB4puhk3DLheVvjn0puoYvzoX1H7gBEM="; + hash = "sha256-1/OuwyQU68tsg9WOl0Eg4ZM28sD6JDMQN9i1LZLYOuE="; }; - vendorHash = "sha256-1aYg6wDG2hzUshtHs9KiJDAFb4OM1oupUJAh3LR4KxY="; + vendorHash = "sha256-YjM2ZpXm3DGNRtCGvj7+0+bXAnb7HXYzQvxCSL4+hHo="; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; From 432e9dc39247d994e1bfa4de3813266c24a4cdea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Apr 2025 15:42:43 +0000 Subject: [PATCH 040/165] refine: 0.5.6 -> 0.5.7 --- pkgs/by-name/re/refine/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/refine/package.nix b/pkgs/by-name/re/refine/package.nix index 6445c28e9359..b7f4a012fb8f 100644 --- a/pkgs/by-name/re/refine/package.nix +++ b/pkgs/by-name/re/refine/package.nix @@ -35,7 +35,7 @@ in python3Packages.buildPythonApplication rec { pname = "refine"; - version = "0.5.6"; + version = "0.5.7"; pyproject = false; # uses meson src = fetchFromGitLab { @@ -43,7 +43,7 @@ python3Packages.buildPythonApplication rec { owner = "TheEvilSkeleton"; repo = "Refine"; tag = version; - hash = "sha256-cIJWTzeLm2YP8Pm/nzcYHIGzBOmQlPe0lQ+b6BufIMg="; + hash = "sha256-Ew/FCCJxgc5ybc/o6tEYP65G24sEmVLoeMTu9/cCjVQ="; }; nativeBuildInputs = [ From 97d49e8b2b164d622022c0e78b7fe56e480d7810 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Apr 2025 17:51:18 +0000 Subject: [PATCH 041/165] containerd: 2.0.4 -> 2.0.5 --- pkgs/by-name/co/containerd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/containerd/package.nix b/pkgs/by-name/co/containerd/package.nix index 52c9167111fb..ad25a106c215 100644 --- a/pkgs/by-name/co/containerd/package.nix +++ b/pkgs/by-name/co/containerd/package.nix @@ -16,7 +16,7 @@ buildGoModule rec { pname = "containerd"; - version = "2.0.4"; + version = "2.0.5"; outputs = [ "out" @@ -27,7 +27,7 @@ buildGoModule rec { owner = "containerd"; repo = "containerd"; tag = "v${version}"; - hash = "sha256-KW2fKdsJ590UPGcu2O3IGyJ+/iY0c8GQLirL8zK3F14="; + hash = "sha256-BY6lIzTlJbBbeIxCtSd7NcYVEWta3VNMmHmH97ksGsE="; }; postPatch = "patchShebangs ."; From 14d4068c1c6edfa904d7f89ebd1929a830c6bbdd Mon Sep 17 00:00:00 2001 From: Tim Keller Date: Sat, 19 Apr 2025 13:44:30 -0500 Subject: [PATCH 042/165] pavolctld: 1.0.1 -> 1.0.2 --- pkgs/by-name/pa/pavolctld/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/pavolctld/package.nix b/pkgs/by-name/pa/pavolctld/package.nix index f024e71aabd9..471bd1704141 100644 --- a/pkgs/by-name/pa/pavolctld/package.nix +++ b/pkgs/by-name/pa/pavolctld/package.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "pavolctld"; - version = "1.0.1"; + version = "1.0.2"; src = fetchgit { url = "https://git.tjkeller.xyz/pavolctld"; tag = "v${finalAttrs.version}"; - hash = "sha256-nmN8bQKQNGpCGvHQnZK9YQgB80SxRSds0V9Y7h/Guh8="; + hash = "sha256-gNEXED+9BkCCLi8oW2GZi9Azd/zOWUvu/bY0a1WbE/A="; }; buildInputs = [ libpulseaudio ]; From 6514b716dd560facd5841c81fe5e08eda7577d09 Mon Sep 17 00:00:00 2001 From: Zaechus Date: Sat, 19 Apr 2025 01:51:20 -0600 Subject: [PATCH 043/165] dosbox-staging: 0.81.1 -> 0.82.1 --- pkgs/by-name/do/dosbox-staging/package.nix | 29 +++++++++++----------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/do/dosbox-staging/package.nix b/pkgs/by-name/do/dosbox-staging/package.nix index 8e482b956e9b..7aeeb8215cc3 100644 --- a/pkgs/by-name/do/dosbox-staging/package.nix +++ b/pkgs/by-name/do/dosbox-staging/package.nix @@ -1,11 +1,9 @@ { lib, SDL2, - SDL2_image, SDL2_net, alsa-lib, fetchFromGitHub, - fetchpatch, fluidsynth, gitUpdater, glib, @@ -33,23 +31,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosbox-staging"; - version = "0.81.1"; + version = "0.82.1"; + shortRev = "13441a2"; src = fetchFromGitHub { owner = "dosbox-staging"; repo = "dosbox-staging"; rev = "v${finalAttrs.version}"; - hash = "sha256-XGssEyX+AVv7/ixgGTRtPFjsUSX0FT0fhP+TXsFl2fY="; + hash = "sha256-BVeFBKqTQiEftWVvMkSYBjC6dCYI4juWD4A6Bx8E8/Y="; }; - patches = [ - (fetchpatch { - name = "darwin-allow-bypass-wraps.patch"; - url = "https://github.com/dosbox-staging/dosbox-staging/commit/9f0fc1dc762010e5f7471d01c504d817a066cae3.patch"; - hash = "sha256-IzxRE1Vr+M8I5hdy80UwebjJ5R1IlH9ymaYgs6VwAO4="; - }) - ]; - nativeBuildInputs = [ gtest makeWrapper @@ -60,7 +51,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ SDL2 - SDL2_image SDL2_net fluidsynth glib @@ -84,8 +74,18 @@ stdenv.mkDerivation (finalAttrs: { "man" ]; + # replace instances of the get-version.sh script that uses git in meson.build with manual values + postPatch = '' + substituteInPlace meson.build \ + --replace-fail "meson.project_source_root() + '/scripts/get-version.sh'," "'printf'," \ + --replace-fail "'version', check: true," "'${finalAttrs.version}', check: true," \ + --replace-fail "'./scripts/get-version.sh', 'hash'," "'printf', '${ + builtins.substring 0 5 finalAttrs.shortRev + }'," + ''; + postInstall = '' - install -Dm644 $src/contrib/linux/dosbox-staging.desktop $out/share/applications/ + install -Dm644 $src/contrib/linux/org.dosbox-staging.dosbox-staging.desktop $out/share/applications/ ''; # Rename binary, add a wrapper, and copy manual to avoid conflict with @@ -125,6 +125,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ joshuafern + Zaechus ]; platforms = lib.platforms.unix; priority = 101; From 9b844c04dc7842dc6e8269aac7d2f121f0dca607 Mon Sep 17 00:00:00 2001 From: l1npengtul Date: Mon, 7 Apr 2025 01:48:34 +0900 Subject: [PATCH 044/165] airwin2rack: 2.13.0 -> 2.13.0-unstable-2025-04-07 --- pkgs/by-name/ai/airwin2rack/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ai/airwin2rack/package.nix b/pkgs/by-name/ai/airwin2rack/package.nix index e36aed4a6046..f622c15f192e 100644 --- a/pkgs/by-name/ai/airwin2rack/package.nix +++ b/pkgs/by-name/ai/airwin2rack/package.nix @@ -53,7 +53,7 @@ let vcvRackSdk = srcOnly vcv-rack; pname = "airwin2rack"; - version = "2.13.0"; + version = "2.13.0-unstable-2025-04-07"; in stdenv.mkDerivation { inherit pname; @@ -62,8 +62,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "baconpaul"; repo = "airwin2rack"; - tag = "DAWPlugin"; - hash = "sha256-xjE9M5fMeOOYncq7xe+v++XvfUL6QZc2tF0jnYWSwKQ="; + rev = "595eb7c7ccec5f9e662f8d620579a91dab60c1ff"; + hash = "sha256-gBphJ6WSPw6DOQk64w8GmLrtuYSF7NFEf6xK1oxOF3w="; fetchSubmodules = true; }; From 71a572c937b06e87a93b2c2f5fd8656bb4e46378 Mon Sep 17 00:00:00 2001 From: Shogo Takata Date: Wed, 9 Apr 2025 13:11:59 +0900 Subject: [PATCH 045/165] gitlab-ci-local: remove unused dependencies this reduces the closure size from 1.2GB to 220MB dependencies removed - python3 - nodejs source - gcc --- pkgs/by-name/gi/gitlab-ci-local/package.nix | 23 +++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/by-name/gi/gitlab-ci-local/package.nix b/pkgs/by-name/gi/gitlab-ci-local/package.nix index 20f10ef517a4..0e1250e287f1 100644 --- a/pkgs/by-name/gi/gitlab-ci-local/package.nix +++ b/pkgs/by-name/gi/gitlab-ci-local/package.nix @@ -34,6 +34,29 @@ buildNpmPackage rec { ''; postInstall = '' + NODE_MODULES=$out/lib/node_modules/gitlab-ci-local/node_modules + + # Remove intermediate build files for re2 to reduce dependencies. + # + # This does not affect the behavior. On npm `re2` does not ship + # the build directory and downloads a prebuilt version of the + # `re2.node` binary. This method produces the same result. + find $NODE_MODULES/re2/build -type f ! -path "*/Release/re2.node" -delete + strip -x $NODE_MODULES/re2/build/Release/re2.node + + # Remove files that depend on python3 + # + # The node-gyp package is only used for building re2, so it is + # not needed at runtime. I did not remove the whole directory + # because of some dangling links to the node-gyp directory which + # is not required. It is possible to remove the directory and all + # the files that link to it, but I figured it was not worth + # tracking down the files. + # + # The re2/vendor directory is used for building the re2.node + # binary, so it is not needed at runtime. + rm -rf $NODE_MODULES/{node-gyp/gyp,re2/vendor} + wrapProgram $out/bin/gitlab-ci-local \ --prefix PATH : "${ lib.makeBinPath [ From 3a3218daea33a06427cdcec062031c1b929afcb2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Apr 2025 02:33:02 +0000 Subject: [PATCH 046/165] gitbutler: 0.14.16 -> 0.14.18 --- pkgs/by-name/gi/gitbutler/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix index da4aafa6d9ee..7765b611d14f 100644 --- a/pkgs/by-name/gi/gitbutler/package.nix +++ b/pkgs/by-name/gi/gitbutler/package.nix @@ -35,13 +35,13 @@ in rustPlatform.buildRustPackage rec { pname = "gitbutler"; - version = "0.14.16"; + version = "0.14.18"; src = fetchFromGitHub { owner = "gitbutlerapp"; repo = "gitbutler"; tag = "release/${version}"; - hash = "sha256-SbxoLlXa6ZouZPY4P29ol9caDrM9XyJyBl35Wemmh9Y="; + hash = "sha256-lYC7thGiCAW6snGyE+qQteS1WfY9k3aez84U8PEjmjg="; }; # Let Tauri know what version we're building @@ -60,11 +60,11 @@ rustPlatform.buildRustPackage rec { ''; useFetchCargoVendor = true; - cargoHash = "sha256-VlGHexsNOwipyKiotWYgt8E+x6C22a7xW2Zft39FeJE="; + cargoHash = "sha256-VVGdZxfBLj1kKEJjck5jhOsoW4KRUWiup6w6wpRto7Q="; pnpmDeps = pnpm_9.fetchDeps { inherit pname version src; - hash = "sha256-Zf/n49nb1PcE3RMeBoN3EAershxQh1AO8Hx9m3NV9XM="; + hash = "sha256-v+nW5C4an5Yx6Kfd1iErNiXRofPubgLSNFZu/Ae1DFc="; }; nativeBuildInputs = [ From db1f519498e2a01bd024c34c92fb18598512e4b7 Mon Sep 17 00:00:00 2001 From: qubitnano <146656568+qubitnano@users.noreply.github.com> Date: Sat, 19 Apr 2025 23:40:57 -0400 Subject: [PATCH 047/165] eduke32: 0-unstable-2024-07-26 -> 0-unstable-2025-04-11 --- pkgs/by-name/ed/eduke32/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ed/eduke32/package.nix b/pkgs/by-name/ed/eduke32/package.nix index 673e38d05875..3c1cc3607a6f 100644 --- a/pkgs/by-name/ed/eduke32/package.nix +++ b/pkgs/by-name/ed/eduke32/package.nix @@ -33,14 +33,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "eduke32"; - version = "0-unstable-2024-07-26"; + version = "0-unstable-2025-04-11"; src = fetchFromGitLab { domain = "voidpoint.io"; owner = "terminx"; repo = "eduke32"; - rev = "19c21b9ab10b0c17147c9ad951cc15279ed33f77"; - hash = "sha256-lwnx2tVjbHouB0vaT7Dh1Ozea8+7Az6e4Wn6HmxDxCo="; + rev = "b8759847124c2c53a165a02efef4a0c778674baf"; + hash = "sha256-PudO6EKCh6UpoY6GT/J0hkVteKNIAO4Q454jIzaegMg="; }; patches = [ @@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "SDLCONFIG=${SDL2}/bin/sdl2-config" # git rev-list --count HEAD - "VC_REV=10593" + "VC_REV=10619" "VC_HASH=${lib.substring 0 9 finalAttrs.src.rev}" "VC_BRANCH=master" ]; From 4c32e3b0c071661a5830fc395e58b929768a7987 Mon Sep 17 00:00:00 2001 From: emaryn Date: Sun, 20 Apr 2025 21:55:21 +0800 Subject: [PATCH 048/165] cplay-ng: 5.3.1 -> 5.4.0 Diff: https://github.com/xi/cplay-ng/compare/5.3.1...5.4.0 --- pkgs/by-name/cp/cplay-ng/package.nix | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/cp/cplay-ng/package.nix b/pkgs/by-name/cp/cplay-ng/package.nix index 82b331616607..5a1b7919c349 100644 --- a/pkgs/by-name/cp/cplay-ng/package.nix +++ b/pkgs/by-name/cp/cplay-ng/package.nix @@ -1,32 +1,27 @@ { lib, - python3, + python3Packages, fetchFromGitHub, makeWrapper, mpv, pulseaudio, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "cplay-ng"; - version = "5.3.1"; + version = "5.4.0"; + pyproject = true; src = fetchFromGitHub { owner = "xi"; repo = "cplay-ng"; - rev = version; - hash = "sha256-6mphhoLDkGZ2r+elzLlPl3B8fNz3loqrQB8x8276AHI="; + tag = version; + hash = "sha256-ob5wX+Q5XKB/fTYG5phLU61imonpk2A/fk5cg/dfr1Y="; }; - nativeBuildInputs = [ - makeWrapper - ]; + nativeBuildInputs = [ makeWrapper ]; - build-system = [ - python3.pkgs.setuptools - ]; - - pyproject = true; + build-system = [ python3Packages.setuptools ]; postInstall = '' wrapProgram $out/bin/cplay-ng \ @@ -38,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { } ''; - meta = with lib; { + meta = { homepage = "https://github.com/xi/cplay-ng"; description = "Simple curses audio player"; mainProgram = "cplay-ng"; @@ -55,7 +50,7 @@ python3.pkgs.buildPythonApplication rec { maintained. This is a rewrite that aims to stay true to the original design while evolving with a shifting environment. ''; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ fgaz ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ fgaz ]; }; } From fc2e71670085393fc85dab6676d16458e1b61dd9 Mon Sep 17 00:00:00 2001 From: Stefan Wiehler Date: Sat, 19 Apr 2025 09:43:20 +0200 Subject: [PATCH 049/165] python313Packages.benqprojector: init at 0.1.6 --- .../python-modules/benqprojector/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/benqprojector/default.nix diff --git a/pkgs/development/python-modules/benqprojector/default.nix b/pkgs/development/python-modules/benqprojector/default.nix new file mode 100644 index 000000000000..4dd1e9c0fea8 --- /dev/null +++ b/pkgs/development/python-modules/benqprojector/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + hatch-vcs, + pyserial, + pyserial-asyncio-fast, +}: + +buildPythonPackage rec { + pname = "benqprojector"; + version = "0.1.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rrooggiieerr"; + repo = "benqprojector.py"; + tag = version; + hash = "sha256-Ys2C44kr5gd6tXO51OFRx4YVKVRGLfFPCYDFGt+gN0c="; + }; + + build-system = [ + hatchling + hatch-vcs + ]; + + dependencies = [ + pyserial + pyserial-asyncio-fast + ]; + + # Test cases require an actual serial/telnet connection to a projector + doCheck = false; + + pythonImportsCheck = [ "benqprojector" ]; + + meta = rec { + description = "Python library to control BenQ projectors"; + homepage = "https://github.com/rrooggiieerr/benqprojector.py"; + changelog = "${homepage}/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ sephalon ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6ab1d23a3b94..e20385f97800 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1748,6 +1748,8 @@ self: super: with self; { beniget = callPackage ../development/python-modules/beniget { }; + benqprojector = callPackage ../development/python-modules/benqprojector { }; + bentoml = callPackage ../development/python-modules/bentoml { }; berkeleydb = callPackage ../development/python-modules/berkeleydb { }; From 2711554868c1a5985fa890a91a267f40ae4b6cb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Dele=C5=84kec?= Date: Sat, 19 Apr 2025 08:01:47 +0100 Subject: [PATCH 050/165] vgmstream: disable celt support on non-x86_64 This fixes build on aarch64-linux. Due to code rot in the versions of celt required, the vendored autotools cannot handle aarch64, and nixos is presently unable to regenerate it. It currently happens to work on x86_64-linux, so disable it everywhere else. --- pkgs/by-name/vg/vgmstream/package.nix | 54 +++++++++++++++------------ 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/vg/vgmstream/package.nix b/pkgs/by-name/vg/vgmstream/package.nix index 2e0e84274dcc..f6901368baae 100644 --- a/pkgs/by-name/vg/vgmstream/package.nix +++ b/pkgs/by-name/vg/vgmstream/package.nix @@ -15,17 +15,7 @@ nix-update-script, }: -stdenv.mkDerivation rec { - pname = "vgmstream"; - version = "1980"; - - src = fetchFromGitHub { - owner = "vgmstream"; - repo = "vgmstream"; - tag = "r${version}"; - hash = "sha256-TmaWC04XbtFfBYhmTO4ouh3NoByio1BCpDJGJy3r0NY="; - }; - +let # https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/atrac9.cmake atrac9-src = fetchFromGitHub { owner = "Thealexbarney"; @@ -43,6 +33,18 @@ stdenv.mkDerivation rec { url = "https://downloads.xiph.org/releases/celt/celt-0.11.0.tar.gz"; hash = "sha256-JI3b44iCxQ29bqJGNH/L18pEuWiTFZ2132ceaqe8U0E="; }; +in + +stdenv.mkDerivation rec { + pname = "vgmstream"; + version = "1980"; + + src = fetchFromGitHub { + owner = "vgmstream"; + repo = "vgmstream"; + tag = "r${version}"; + hash = "sha256-TmaWC04XbtFfBYhmTO4ouh3NoByio1BCpDJGJy3r0NY="; + }; passthru.updateScript = nix-update-script { attrPath = "vgmstream"; @@ -80,28 +82,34 @@ stdenv.mkDerivation rec { + # cmake/dependencies/celt.cmake uses configure_file to modify ${CELT_0110_PATH}/libcelt/ecintrin.h. # Therefore, CELT_0110_PATH needs to point to a mutable directory. - '' + lib.optionalString (stdenv.system == "x86_64-linux") '' mkdir -p dependencies/celt-0.11.0/ cp -r ${celt-0_11_0-src}/* dependencies/celt-0.11.0/ chmod -R +w dependencies/celt-0.11.0/ ''; - cmakeFlags = [ - "-DATRAC9_PATH=${atrac9-src}" - "-DCELT_0061_PATH=${celt-0_6_1-src}" - "-DCELT_0110_PATH=../dependencies/celt-0.11.0" - # libg719_decode omitted because it doesn't have a free software license - ]; + cmakeFlags = + [ + "-DATRAC9_PATH=${atrac9-src}" + ] + # Only supported on x86_64-linux + ++ lib.optionals (stdenv.system == "x86_64-linux") [ + "-DCELT_0061_PATH=${celt-0_6_1-src}" + "-DCELT_0110_PATH=../dependencies/celt-0.11.0" + # libg719_decode omitted because it doesn't have a free software license + ]; meta = with lib; { description = "Library for playback of various streamed audio formats used in video games"; homepage = "https://vgmstream.org"; maintainers = with maintainers; [ zane ]; - license = with licenses; [ - isc # vgmstream itself - mit # atrac9 - bsd2 # celt - ]; + license = + with licenses; + [ + isc # vgmstream itself + mit # atrac9 + ] + ++ optional (stdenv.system == "x86_64-linux") bsd2; platforms = with platforms; unix; }; } From 8391765d6f098af6dced2eda7a2753b34d24a4cd Mon Sep 17 00:00:00 2001 From: azahi Date: Sun, 20 Apr 2025 23:59:00 +0300 Subject: [PATCH 051/165] qzdl: unstable-2023-04-04 -> unstable-2025-01-04 --- .../{non-bundled-inih.patch => cmake.patch} | 19 ++++++++++--------- pkgs/games/qzdl/default.nix | 8 ++++---- 2 files changed, 14 insertions(+), 13 deletions(-) rename pkgs/games/qzdl/{non-bundled-inih.patch => cmake.patch} (58%) diff --git a/pkgs/games/qzdl/non-bundled-inih.patch b/pkgs/games/qzdl/cmake.patch similarity index 58% rename from pkgs/games/qzdl/non-bundled-inih.patch rename to pkgs/games/qzdl/cmake.patch index 7e47dd8c2017..cdb4a451f37d 100644 --- a/pkgs/games/qzdl/non-bundled-inih.patch +++ b/pkgs/games/qzdl/cmake.patch @@ -1,10 +1,10 @@ diff --git i/CMakeLists.txt w/CMakeLists.txt -index 10a8fb6..dcab540 100644 +index 364f72b..2d5070d 100644 --- i/CMakeLists.txt +++ w/CMakeLists.txt -@@ -6,16 +6,8 @@ set(CMAKE_AUTOMOC ON) - project(qzdl LANGUAGES C CXX) - find_package(Qt5 COMPONENTS Core Widgets REQUIRED) +@@ -7,16 +7,8 @@ project(qzdl LANGUAGES C CXX) + find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Widgets) + find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Widgets REQUIRED) -include(FetchContent) -FetchContent_Declare( @@ -14,14 +14,14 @@ index 10a8fb6..dcab540 100644 -) -FetchContent_GetProperties(inih) -if (NOT inih_POPULATED) -- FetchContent_Populate(inih) +- FetchContent_MakeAvailable(inih) -endif() +find_package(PkgConfig) +pkg_check_modules(INIH inih) add_executable( zdl -@@ -45,9 +37,8 @@ add_executable( +@@ -46,9 +38,9 @@ add_executable( libwad.cpp qzdl.cpp ${PROJECT_SOURCE_DIR}/zdlconf/zdlconf.cpp @@ -30,7 +30,8 @@ index 10a8fb6..dcab540 100644 -target_include_directories(zdl PRIVATE ${PROJECT_SOURCE_DIR}/zdlconf) -target_include_directories(zdl PRIVATE ${inih_SOURCE_DIR}) --target_link_libraries(zdl Qt5::Core Qt5::Widgets) -+target_include_directories(zdl PRIVATE ${PROJECT_SOURCE_DIR}/zdlconf ${INIH_INCLUDEDIR}) -+target_link_libraries(zdl Qt5::Core Qt5::Widgets ${INIH_LDFLAGS}) +-target_link_libraries(zdl Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Widgets) ++target_include_directories(zdl PRIVATE ${PROJECT_SOURCE_DIR}/zdlconf ${inih_INCLUDE_DIR}) ++target_link_libraries(zdl Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Widgets ${INIH_LDFLAGS}) ++ +install(TARGETS zdl RUNTIME DESTINATION "bin") diff --git a/pkgs/games/qzdl/default.nix b/pkgs/games/qzdl/default.nix index e7cbc238d5b7..a2f0dac3a385 100644 --- a/pkgs/games/qzdl/default.nix +++ b/pkgs/games/qzdl/default.nix @@ -14,17 +14,17 @@ stdenv.mkDerivation { pname = "qzdl"; - version = "unstable-2023-04-04"; + version = "unstable-2025-01-04"; src = fetchFromGitHub { owner = "qbasicer"; repo = "qzdl"; - rev = "44aaec0182e781a3cef373e5c795c9dbd9cd61bb"; - hash = "sha256-K/mJQb7uO2H94krWJIJtFRYd6BAe2TX1xBt6fGBb1tA="; + rev = "a03191777152b932b9bf15f45d439bf38e8c7679"; + hash = "sha256-YRWJBuYY1QI/liiGw5zYFqsrK+DyvW1Lpava6CkmVnQ="; }; patches = [ - ./non-bundled-inih.patch + ./cmake.patch ]; nativeBuildInputs = [ From e5ae91409174b1db34fad7b8ad844a4177c27a32 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 20 Apr 2025 23:24:28 +0200 Subject: [PATCH 052/165] gargoyle: 2019.1.1 -> 2023.1 --- pkgs/by-name/ga/gargoyle/darwin.sh | 54 ----------- pkgs/by-name/ga/gargoyle/package.nix | 131 +++++++++++---------------- 2 files changed, 55 insertions(+), 130 deletions(-) delete mode 100644 pkgs/by-name/ga/gargoyle/darwin.sh diff --git a/pkgs/by-name/ga/gargoyle/darwin.sh b/pkgs/by-name/ga/gargoyle/darwin.sh deleted file mode 100644 index ed0daec4ef1f..000000000000 --- a/pkgs/by-name/ga/gargoyle/darwin.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!@shell@ - -set -e - -GARGDIST=build/macosx.release -BUNDLE=${out}/Applications/Gargoyle.app/Contents -TERPS=" -advsys/advsys -agility/agility -alan2/alan2 -alan3/alan3 -bocfel/bocfel -frotz/frotz -garglk/gargoyle -geas/geas -git/git -glulxe/glulxe -hugo/hugo -jacl/jacl -level9/level9 -magnetic/magnetic -nitfol/nitfol -scare/scare -scott/scott -tads/tadsr -" - -mkdir -p $BUNDLE/MacOS -mkdir -p $BUNDLE/Frameworks -mkdir -p $BUNDLE/Resources -mkdir -p $BUNDLE/PlugIns - -install_name_tool -id @executable_path/../Frameworks/libgarglk.dylib $GARGDIST/garglk/libgarglk.dylib -for file in $TERPS -do -install_name_tool -change @executable_path/libgarglk.dylib @executable_path/../Frameworks/libgarglk.dylib $GARGDIST/$file || true -cp -f $GARGDIST/$file $BUNDLE/PlugIns -done - -cp -f garglk/launcher.plist $BUNDLE/Info.plist -cp -f $GARGDIST/garglk/gargoyle $BUNDLE/MacOS/Gargoyle -cp -f $GARGDIST/garglk/libgarglk.dylib $BUNDLE/Frameworks -cp -f $GARGDIST/garglk/libgarglk.dylib $BUNDLE/PlugIns -cp -f garglk/launchmac.nib $BUNDLE/Resources/MainMenu.nib -cp -f garglk/garglk.ini $BUNDLE/Resources -cp -f garglk/*.icns $BUNDLE/Resources -cp -f licenses/* $BUNDLE/Resources - -mkdir $BUNDLE/Resources/Fonts -cp fonts/LiberationMono*.ttf $BUNDLE/Resources/Fonts -cp fonts/LinLibertine*.otf $BUNDLE/Resources/Fonts - -mkdir -p ${out}/bin -ln -s $BUNDLE/MacOS/Gargoyle ${out}/bin/gargoyle diff --git a/pkgs/by-name/ga/gargoyle/package.nix b/pkgs/by-name/ga/gargoyle/package.nix index 7fb5dd5eb010..017bd76d7c18 100644 --- a/pkgs/by-name/ga/gargoyle/package.nix +++ b/pkgs/by-name/ga/gargoyle/package.nix @@ -2,104 +2,83 @@ lib, stdenv, fetchFromGitHub, - replaceVarsWith, - jam, - cctools, + fetchDebianPatch, + cmake, pkg-config, - SDL, - SDL_mixer, - SDL_sound, - gtk2, + fluidsynth, + fmt, + freetype, + libjpeg, + libopenmpt, + libpng, + libsndfile, libvorbis, - smpeg, + mpg123, + qt6, }: -let - - jamenv = - '' - unset AR - '' - + ( - if stdenv.hostPlatform.isDarwin then - '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${lib.getDev SDL}/include/SDL" - export GARGLKINI="$out/Applications/Gargoyle.app/Contents/Resources/garglk.ini" - '' - else - '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/libexec/gargoyle" - export DESTDIR="$out" - export _BINDIR=libexec/gargoyle - export _APPDIR=libexec/gargoyle - export _LIBDIR=libexec/gargoyle - export GARGLKINI="$out/etc/garglk.ini" - '' - ); - -in - stdenv.mkDerivation rec { pname = "gargoyle"; - version = "2019.1.1"; + version = "2023.1"; src = fetchFromGitHub { owner = "garglk"; repo = "garglk"; - rev = version; - sha256 = "0w54avmbp4i4zps2rb4acmpa641s6wvwbrln4vbdhcz97fx48nzz"; + tag = version; + hash = "sha256-XsN5FXWJb3DSOjipxr/HW9R7QS+7iEaITERTrbGEMwA="; }; + patches = [ + (fetchDebianPatch { + pname = "gargoyle-free"; + version = "2023.1+dfsg"; + debianRevision = "4"; + patch = "ftbfs_gcc14.patch"; + hash = "sha256-eMx/RlUpq5Ez+1L8VZo40Y3h2ZKkqiQEmKTlkZRMXnI="; + }) + ]; + + postPatch = '' + substituteInPlace garglk/garglk.pc.in \ + --replace "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" "@CMAKE_INSTALL_FULL_LIBDIR@" \ + --replace "\''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@" "@CMAKE_INSTALL_FULL_INCLUDEDIR@" + ''; + nativeBuildInputs = [ - jam + cmake pkg-config - ] ++ lib.optional stdenv.hostPlatform.isDarwin cctools; + qt6.wrapQtAppsHook + ]; buildInputs = [ - SDL - SDL_mixer - SDL_sound - gtk2 - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - smpeg + fluidsynth + fmt + freetype + libjpeg + libopenmpt + libpng + libsndfile libvorbis + mpg123 + qt6.qtbase + qt6.qtmultimedia + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + qt6.qtwayland ]; - # Workaround build failure on -fno-common toolchains: - # ld: build/linux.release/alan3/Location.o:(.bss+0x0): multiple definition of - # `logFile'; build/linux.release/alan3/act.o:(.bss+0x0): first defined here - # TODO: drop once updated to 2022.1 or later. - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - buildPhase = jamenv + "jam -j$NIX_BUILD_CORES"; - - installPhase = - if stdenv.hostPlatform.isDarwin then - (replaceVarsWith { - replacements = { inherit (stdenv) shell; }; - isExecutable = true; - src = ./darwin.sh; - }) - else - jamenv - + '' - jam -j$NIX_BUILD_CORES install - mkdir -p "$out/bin" - ln -s ../libexec/gargoyle/gargoyle "$out/bin" - mkdir -p "$out/etc" - cp garglk/garglk.ini "$out/etc" - mkdir -p "$out/share/applications" - cp garglk/gargoyle.desktop "$out/share/applications" - mkdir -p "$out/share/icons/hicolor/32x32/apps" - cp garglk/gargoyle-house.png "$out/share/icons/hicolor/32x32/apps" - ''; - - enableParallelBuilding = true; + cmakeFlags = [ + (lib.cmakeFeature "INTERFACE" "QT") + (lib.cmakeFeature "SOUND" "QT") + (lib.cmakeBool "WITH_QT6" true) + # fatal error: 'macglk_startup.h' file not found + (lib.cmakeBool "WITH_AGILITY" (!stdenv.hostPlatform.isDarwin)) + (lib.cmakeBool "WITH_LEVEL9" (!stdenv.hostPlatform.isDarwin)) + (lib.cmakeBool "WITH_MAGNETIC" (!stdenv.hostPlatform.isDarwin)) + ]; meta = with lib; { - broken = stdenv.hostPlatform.isDarwin; homepage = "http://ccxvii.net/gargoyle/"; license = licenses.gpl2Plus; description = "Interactive fiction interpreter GUI"; From a443e015b2cba3dec28a91b8ecb4f5c30a122bdc Mon Sep 17 00:00:00 2001 From: azahi Date: Mon, 21 Apr 2025 01:11:00 +0300 Subject: [PATCH 053/165] qzdl: move to by-name --- pkgs/{games => by-name/qz}/qzdl/cmake.patch | 0 .../qzdl/default.nix => by-name/qz/qzdl/package.nix} | 9 ++++----- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 4 insertions(+), 7 deletions(-) rename pkgs/{games => by-name/qz}/qzdl/cmake.patch (100%) rename pkgs/{games/qzdl/default.nix => by-name/qz/qzdl/package.nix} (90%) diff --git a/pkgs/games/qzdl/cmake.patch b/pkgs/by-name/qz/qzdl/cmake.patch similarity index 100% rename from pkgs/games/qzdl/cmake.patch rename to pkgs/by-name/qz/qzdl/cmake.patch diff --git a/pkgs/games/qzdl/default.nix b/pkgs/by-name/qz/qzdl/package.nix similarity index 90% rename from pkgs/games/qzdl/default.nix rename to pkgs/by-name/qz/qzdl/package.nix index a2f0dac3a385..3b708036d9e0 100644 --- a/pkgs/games/qzdl/default.nix +++ b/pkgs/by-name/qz/qzdl/package.nix @@ -6,8 +6,7 @@ inih, ninja, pkg-config, - qtbase, - wrapQtAppsHook, + libsForQt5, makeDesktopItem, copyDesktopItems, }: @@ -32,12 +31,12 @@ stdenv.mkDerivation { copyDesktopItems ninja pkg-config - wrapQtAppsHook + libsForQt5.wrapQtAppsHook ]; buildInputs = [ inih - qtbase + libsForQt5.qtbase ]; postInstall = '' @@ -59,7 +58,7 @@ stdenv.mkDerivation { description = "ZDoom WAD Launcher"; homepage = "https://zdl.vectec.net"; license = licenses.gpl3Only; - inherit (qtbase.meta) platforms; + inherit (libsForQt5.qtbase.meta) platforms; maintainers = with maintainers; [ azahi ]; mainProgram = "zdl"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e695a90ed900..a7662651a7de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18942,8 +18942,6 @@ with pkgs; qtrvsim = libsForQt5.callPackage ../applications/science/computer-architecture/qtrvsim { }; - qzdl = libsForQt5.callPackage ../games/qzdl { }; - rbspy = darwin.apple_sdk_11_0.callPackage ../development/tools/rbspy { }; pick-colour-picker = python3Packages.callPackage ../applications/graphics/pick-colour-picker { From 95c618640bb9a182d798a28d9ef9a1862a7277e0 Mon Sep 17 00:00:00 2001 From: azahi Date: Mon, 21 Apr 2025 01:13:52 +0300 Subject: [PATCH 054/165] qzdl: refactor --- pkgs/by-name/qz/qzdl/package.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/qz/qzdl/package.nix b/pkgs/by-name/qz/qzdl/package.nix index 3b708036d9e0..19f979187856 100644 --- a/pkgs/by-name/qz/qzdl/package.nix +++ b/pkgs/by-name/qz/qzdl/package.nix @@ -3,17 +3,16 @@ stdenv, fetchFromGitHub, cmake, + copyDesktopItems, inih, - ninja, - pkg-config, libsForQt5, makeDesktopItem, - copyDesktopItems, + ninja, + pkg-config, }: - stdenv.mkDerivation { pname = "qzdl"; - version = "unstable-2025-01-04"; + version = "3.3.0.0-unstable-2025-01-04"; src = fetchFromGitHub { owner = "qbasicer"; @@ -54,12 +53,12 @@ stdenv.mkDerivation { }) ]; - meta = with lib; { + meta = { description = "ZDoom WAD Launcher"; homepage = "https://zdl.vectec.net"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; inherit (libsForQt5.qtbase.meta) platforms; - maintainers = with maintainers; [ azahi ]; + maintainers = [ lib.maintainers.azahi ]; mainProgram = "zdl"; }; } From 969349175a875cf08dc1a4d89225e5d4036b3acc Mon Sep 17 00:00:00 2001 From: azahi Date: Sun, 20 Apr 2025 23:46:48 +0300 Subject: [PATCH 055/165] trdl: refactor --- pkgs/by-name/tr/trdl-client/package.nix | 41 +++++++++---------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/pkgs/by-name/tr/trdl-client/package.nix b/pkgs/by-name/tr/trdl-client/package.nix index fddde874d76c..b02807e16e66 100644 --- a/pkgs/by-name/tr/trdl-client/package.nix +++ b/pkgs/by-name/tr/trdl-client/package.nix @@ -2,33 +2,29 @@ lib, buildGoModule, fetchFromGitHub, - testers, - trdl-client, + versionCheckHook, }: - -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "trdl-client"; version = "0.10.0"; src = fetchFromGitHub { owner = "werf"; repo = "trdl"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0Q0qs7lzLnJChhT3LGVCHIz1ruci/PGGLJdR9FO1RyE="; }; - sourceRoot = "${src.name}/client"; + sourceRoot = "${finalAttrs.src.name}/client"; vendorHash = "sha256-veSgWyk1ytHRNHuuZJBV+1rqGDsdEb01CImm+EexFCk="; subPackages = [ "cmd/trdl" ]; - env.CGO_ENABLED = 0; - ldflags = [ "-s" "-w" - "-X github.com/werf/trdl/client/pkg/trdl.Version=${src.rev}" + "-X github.com/werf/trdl/client/pkg/trdl.Version=${finalAttrs.src.rev}" ]; tags = [ @@ -36,20 +32,13 @@ buildGoModule rec { "dfssh" ]; - # There are no tests for cmd/trdl. - doCheck = false; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/trdl"; + versionCheckProgramArg = "version"; - passthru.tests.version = testers.testVersion { - package = trdl-client; - command = "trdl version"; - version = "v${version}"; - }; - - meta = with lib; { - description = '' - The universal solution for delivering your software updates securely from - a trusted The Update Framework (TUF) repository - ''; + meta = { + description = "Universal solution for delivering your software updates"; longDescription = '' trdl is an Open Source solution providing a secure channel for delivering updates from the Git repository to the end user. @@ -63,9 +52,9 @@ buildGoModule rec { software version from the TUF repository, and uses it. ''; homepage = "https://trdl.dev"; - changelog = "https://github.com/werf/trdl/releases/tag/${src.rev}"; - license = licenses.asl20; - maintainers = with maintainers; [ azahi ]; + changelog = "https://github.com/werf/trdl/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.azahi ]; mainProgram = "trdl"; }; -} +}) From c3831631816e94af09a17b17ebbd32bdd4e6e23a Mon Sep 17 00:00:00 2001 From: patka Date: Mon, 21 Apr 2025 08:44:19 +0200 Subject: [PATCH 056/165] thc-hydra: upgrade pcre to pcre2 Upstream upgraded at version 9.4 --- pkgs/by-name/th/thc-hydra/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/th/thc-hydra/package.nix b/pkgs/by-name/th/thc-hydra/package.nix index f65c0428f7c5..5d974aa26ddf 100644 --- a/pkgs/by-name/th/thc-hydra/package.nix +++ b/pkgs/by-name/th/thc-hydra/package.nix @@ -6,7 +6,7 @@ openssl, ncurses, libidn, - pcre, + pcre2, libssh, libmysqlclient, libpq, @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { openssl ncurses libidn - pcre + pcre2 libssh libmysqlclient libpq From 32002ac255eff1a5357a6914eae63122fbbde1a4 Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 22 Apr 2025 06:13:33 +0800 Subject: [PATCH 057/165] ecos: 2.0.7 -> 2.0.10 Diff: https://github.com/embotech/ecos/compare/v2.0.7...v2.0.10 --- pkgs/by-name/ec/ecos/package.nix | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ec/ecos/package.nix b/pkgs/by-name/ec/ecos/package.nix index ed8104e73a59..736eece3f483 100644 --- a/pkgs/by-name/ec/ecos/package.nix +++ b/pkgs/by-name/ec/ecos/package.nix @@ -4,39 +4,52 @@ fetchFromGitHub, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ecos"; - version = "2.0.7"; + version = "2.0.10"; src = fetchFromGitHub { owner = "embotech"; repo = "ecos"; - rev = version; - sha256 = "1hsndim5kjvcwk5svqa4igawzahj982180xj1d7yd0dbjlgxc7w7"; + tag = "v${finalAttrs.version}"; + hash = "sha256-WMgqDc+XAY3g2wwlefjJ0ATxR5r/jL971FZKtxsunnU="; }; buildPhase = '' + runHook preBuild + make all shared + + runHook postBuild ''; doCheck = true; + checkPhase = '' + runHook preCheck + make test ./runecos + + runHook postCheck ''; installPhase = '' + runHook preInstall + mkdir -p $out/lib cp lib*.a lib*.so $out/lib cp -r include $out/ + + runHook postInstall ''; - meta = with lib; { + meta = { description = "Lightweight conic solver for second-order cone programming"; homepage = "https://www.embotech.com/ECOS"; downloadPage = "https://github.com/embotech/ecos/releases"; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = with maintainers; [ bhipple ]; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ bhipple ]; }; -} +}) From 80a8484c5429ce6a9cb806bf5f11ee4f7e3e30eb Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 22 Apr 2025 06:25:25 +0800 Subject: [PATCH 058/165] elmPackages.elm-json: 0.2.12 -> 0.2.13 --- .../elm/packages/elm-json/default.nix | 32 +++++++++---------- .../packages/elm-json/use-system-ssl.patch | 22 ++++++------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/development/compilers/elm/packages/elm-json/default.nix b/pkgs/development/compilers/elm/packages/elm-json/default.nix index b3c529c7d5c7..dc1208b4239d 100644 --- a/pkgs/development/compilers/elm/packages/elm-json/default.nix +++ b/pkgs/development/compilers/elm/packages/elm-json/default.nix @@ -1,21 +1,21 @@ { lib, - curl, rustPlatform, - fetchurl, - openssl, - stdenv, + fetchFromGitHub, pkg-config, - darwin, + curl, + openssl, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "elm-json"; - version = "0.2.12"; + version = "0.2.13"; - src = fetchurl { - url = "https://github.com/zwilias/elm-json/archive/v${version}.tar.gz"; - sha256 = "sha256:nlpxlPzWk3wwDgczuMI9T6DFY1YtQpQ1R4BhdPbzZBs="; + src = fetchFromGitHub { + owner = "zwilias"; + repo = "elm-json"; + tag = "v${finalAttrs.version}"; + hash = "sha256-pSt4ugP8r7s0ABT3Y9ZbWAG/ShsARtame2lTxXiCuws="; }; cargoPatches = [ ./use-system-ssl.patch ]; @@ -25,19 +25,19 @@ rustPlatform.buildRustPackage rec { buildInputs = [ curl openssl - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + ]; useFetchCargoVendor = true; - cargoHash = "sha256-iDyGPE1BEh1uIf4K6ijtlqugWFtfM/2GGda0u/lCLJ0="; + cargoHash = "sha256-BnL//AHaSnsugtMEnSTynpMyeNt5N7L6PG2wdWDw1y4="; # Tests perform networking and therefore can't work in sandbox doCheck = false; - meta = with lib; { + meta = { description = "Install, upgrade and uninstall Elm dependencies"; mainProgram = "elm-json"; homepage = "https://github.com/zwilias/elm-json"; - license = licenses.mit; - maintainers = [ maintainers.turbomack ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.turbomack ]; }; -} +}) diff --git a/pkgs/development/compilers/elm/packages/elm-json/use-system-ssl.patch b/pkgs/development/compilers/elm/packages/elm-json/use-system-ssl.patch index 54df03019231..feb9d9f927de 100644 --- a/pkgs/development/compilers/elm/packages/elm-json/use-system-ssl.patch +++ b/pkgs/development/compilers/elm/packages/elm-json/use-system-ssl.patch @@ -2,23 +2,23 @@ diff --git a/Cargo.lock b/Cargo.lock index b9bf434..58cfe81 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -685,15 +685,6 @@ version = "0.1.4" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" - --[[package]] +@@ -677,15 +677,6 @@ + checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + + [[package]] -name = "openssl-src" --version = "111.17.0+1.1.1m" +-version = "111.22.0+1.1.1q" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "05d6a336abd10814198f66e2a91ccd7336611f30334119ca8ce300536666fcf4" +-checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853" -dependencies = [ - "cc", -] - - [[package]] +-[[package]] name = "openssl-sys" - version = "0.9.72" -@@ -703,7 +694,6 @@ dependencies = [ + version = "0.9.76" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -694,7 +685,6 @@ "autocfg", "cc", "libc", @@ -30,7 +30,7 @@ diff --git a/Cargo.toml b/Cargo.toml index bc97f20..54d3b14 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -17,8 +17,8 @@ colored = "2.0" +@@ -17,8 +17,8 @@ dialoguer = "0.6" dirs = "3.0" fs2 = "0.4" From 92ff30c8f70ef4a36e1fc73b9743b77ac54925b6 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 22 Apr 2025 02:31:36 +0300 Subject: [PATCH 059/165] gopass-jsonapi: 1.15.15 -> 1.15.16 Diff: https://github.com/gopasspw/gopass-jsonapi/compare/v1.15.15...v1.15.16 Changelog: https://github.com/gopasspw/gopass-jsonapi/blob/v1.15.16/CHANGELOG.md --- pkgs/by-name/go/gopass-jsonapi/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/go/gopass-jsonapi/package.nix b/pkgs/by-name/go/gopass-jsonapi/package.nix index c8ac712834e1..bc9456542310 100644 --- a/pkgs/by-name/go/gopass-jsonapi/package.nix +++ b/pkgs/by-name/go/gopass-jsonapi/package.nix @@ -13,7 +13,7 @@ let - # https://github.com/gopasspw/gopass-jsonapi/blob/v1.15.15/internal/jsonapi/manifest/manifest_path_linux.go + # https://github.com/gopasspw/gopass-jsonapi/blob/v1.15.16/internal/jsonapi/manifest/manifest_path_linux.go manifestPaths = { firefox = "$out/lib/mozilla/native-messaging-hosts/com.justwatch.gopass.json"; chrome = "$out/etc/opt/chrome/native-messaging-hosts/com.justwatch.gopass.json"; @@ -27,16 +27,16 @@ let in buildGoModule rec { pname = "gopass-jsonapi"; - version = "1.15.15"; + version = "1.15.16"; src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass-jsonapi"; rev = "v${version}"; - hash = "sha256-nayg7NTJH6bAPiguyuN37JivfWkpOUX/xI/+PHDi3UI="; + hash = "sha256-Nl69SSqs18zG7eYhBafXFGBVNQglSeffg7Z0Y8zuLmc="; }; - vendorHash = "sha256-khX1CdzN+5T8q2hA3NyCxtz7uw9uDd9u61q3UslTtqs="; + vendorHash = "sha256-zncWJSA6cUthwcFZQXtJmwJZujaXt0Rubcga8D0+ZQc="; subPackages = [ "." ]; @@ -72,7 +72,7 @@ buildGoModule rec { # `gopass-jsonapi configure` will ask for them. (`--libpath` and `--global` # are overriden by `--manifest-path`. `--libpath` is only used to # compute Firefox's global manifest path. See - # https://github.com/gopasspw/gopass-jsonapi/blob/v1.15.15/setup_others.go#L33-L46) + # https://github.com/gopasspw/gopass-jsonapi/blob/v1.15.16/setup_others.go#L33-L46) # # `gopass-jsonapi configure` ask for confirmation before writing any files, # `echo y` gives it. From 2fbfac95bc103786b16737e87d97bb00a6269c45 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 01:29:16 +0000 Subject: [PATCH 060/165] python312Packages.gudhi: 3.10.1 -> 3.11.0 --- pkgs/development/python-modules/gudhi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gudhi/default.nix b/pkgs/development/python-modules/gudhi/default.nix index 064758489e26..145c9158b6a8 100644 --- a/pkgs/development/python-modules/gudhi/default.nix +++ b/pkgs/development/python-modules/gudhi/default.nix @@ -21,15 +21,15 @@ buildPythonPackage rec { pname = "gudhi"; - version = "3.10.1"; + version = "3.11.0"; pyproject = true; src = fetchFromGitHub { owner = "GUDHI"; repo = "gudhi-devel"; - rev = "tags/gudhi-release-${version}"; + tag = "tags/gudhi-release-${version}"; fetchSubmodules = true; - hash = "sha256-zHjSGm3hk3FZQmyQ03y14vJp5xeoofvij1hczKidvVA="; + hash = "sha256-EebPvmioTYBv3VR6SNEfiqi2GC4sZn8WEj0fu42B8yM="; }; nativeBuildInputs = [ From 2ae9c547e482a8051e2723eaf8553dd2d8ad654e Mon Sep 17 00:00:00 2001 From: Willem Meints <1550763+wmeints@users.noreply.github.com> Date: Tue, 22 Apr 2025 07:46:34 +0200 Subject: [PATCH 061/165] Windsurf 1.6.5 -> 1.7.0 --- pkgs/by-name/wi/windsurf/info.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json index 1fa1ddeca88b..f1c364695582 100644 --- a/pkgs/by-name/wi/windsurf/info.json +++ b/pkgs/by-name/wi/windsurf/info.json @@ -1,20 +1,20 @@ { "aarch64-darwin": { - "version": "1.6.5", + "version": "1.7.0", "vscodeVersion": "1.97.0", - "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/d87e525d4461b610eeaba26cba66153dd120ef47/Windsurf-darwin-arm64-1.6.5.zip", - "sha256": "3043acb2902d0ed9178a34591857ede56472527a5c2091a3500ef1e1537bfde7" + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/69a900001328c5e276063fc33dcff89076073a54/Windsurf-darwin-arm64-1.7.0.zip", + "sha256": "06bbc970a2e69891469ece36d435e8e1da91bcf688beeeff189321455154c523" }, "x86_64-darwin": { - "version": "1.6.5", + "version": "1.7.0", "vscodeVersion": "1.97.0", - "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/d87e525d4461b610eeaba26cba66153dd120ef47/Windsurf-darwin-x64-1.6.5.zip", - "sha256": "cdee5037ba3959cec5ab0cd6f18f699cf2724e19e6759e4bd180df728dc0362d" + "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/69a900001328c5e276063fc33dcff89076073a54/Windsurf-darwin-x64-1.7.0.zip", + "sha256": "772947281470ec2f4feea93781c99b7b0d17f46e2aec891f9775f52f9fe83f23" }, "x86_64-linux": { - "version": "1.6.5", + "version": "1.7.0", "vscodeVersion": "1.97.0", - "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/d87e525d4461b610eeaba26cba66153dd120ef47/Windsurf-linux-x64-1.6.5.tar.gz", - "sha256": "f95abc06787b8308bcfdca877049b1cd3251e8affac13d96ddbcdd2c4fa25574" + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/69a900001328c5e276063fc33dcff89076073a54/Windsurf-linux-x64-1.7.0.tar.gz", + "sha256": "d871d33417409c418abf5947fdc57123aea2d85d2993593ad1029ec9423b0b4c" } } From 76c4c908842b79fe68ff8440911f833e854224fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 05:49:28 +0000 Subject: [PATCH 062/165] trealla: 2.66.2 -> 2.68.21 --- pkgs/by-name/tr/trealla/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index bd389490f5b1..158bcd71c45d 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.66.2"; + version = "2.68.21"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-E91w1mQtbnmnGB047UqvdFEg1y9PX7yU2IrXQdN1PYw="; + hash = "sha256-iUK2cbt/m386fyBqS9BcO0H5djApd01E6CwUvZ8WtmA="; }; postPatch = '' From db004fa71254a53e92275d54a7e3ccc0b7de526a Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 22 Apr 2025 09:37:37 +0200 Subject: [PATCH 063/165] zizmor: 1.5.2 -> 1.6.0 Release notes: https://woodruffw.github.io/zizmor/release-notes/#v160 --- pkgs/by-name/zi/zizmor/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix index c3ecf63dca56..bf266e8c6e5b 100644 --- a/pkgs/by-name/zi/zizmor/package.nix +++ b/pkgs/by-name/zi/zizmor/package.nix @@ -6,19 +6,19 @@ versionCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "zizmor"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "woodruffw"; repo = "zizmor"; - tag = "v${version}"; - hash = "sha256-KBQ63SAV8eUIfj1TnQQ636DRnLXj+JO4GDiVX1xS9nw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Has3PrXJIKQh6FdhZ3aGvqJ5keHTRqa+nDAb4fv3xWg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-BMDsV89CcppcuTx1PYyqZO5ZeWDJruudmNjlwnb+QZI="; + cargoHash = "sha256-uXUvEbQpY9E7kTOeXMFN/9b4u4tn/S3HCs0a65Hssn4="; nativeInstallCheckInputs = [ versionCheckHook ]; @@ -29,9 +29,9 @@ rustPlatform.buildRustPackage rec { meta = { description = "Tool for finding security issues in GitHub Actions setups"; homepage = "https://woodruffw.github.io/zizmor/"; - changelog = "https://github.com/woodruffw/zizmor/releases/tag/v${version}"; + changelog = "https://github.com/woodruffw/zizmor/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ lesuisse ]; mainProgram = "zizmor"; }; -} +}) From 0dc6e3caaa371aaaa266174411864ffc92bdefbf Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Tue, 22 Apr 2025 21:48:57 +1200 Subject: [PATCH 064/165] heroic: bump electron version Pinned Electron version is EOL soon. --- pkgs/by-name/he/heroic-unwrapped/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/he/heroic-unwrapped/package.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix index f6ac7868637f..c92d68d57353 100644 --- a/pkgs/by-name/he/heroic-unwrapped/package.nix +++ b/pkgs/by-name/he/heroic-unwrapped/package.nix @@ -8,7 +8,7 @@ python3, makeWrapper, # Upstream uses EOL Electron 31. Use next oldest version. - electron_33, + electron_34, vulkan-helper, gogdl, legendary-heroic, @@ -17,7 +17,7 @@ }: let - electron = electron_33; + electron = electron_34; in stdenv.mkDerivation (finalAttrs: { pname = "heroic-unwrapped"; From 324ba67c8d379051750e9995ce0f5d121e2661d0 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Tue, 22 Apr 2025 13:25:27 -0700 Subject: [PATCH 065/165] wrkflw: init at 3.0.0 --- pkgs/by-name/wr/wrkflw/package.nix | 46 ++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/wr/wrkflw/package.nix diff --git a/pkgs/by-name/wr/wrkflw/package.nix b/pkgs/by-name/wr/wrkflw/package.nix new file mode 100644 index 000000000000..4ec0aec09d73 --- /dev/null +++ b/pkgs/by-name/wr/wrkflw/package.nix @@ -0,0 +1,46 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + openssl, + docker, + versionCheckHook, + nix-update-script, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "wrkflw"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "bahdotsh"; + repo = "wrkflw"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ErzlAVRyDyRo/AAbTjuBhuQtveRttB0ArUugIGuYMiY="; + }; + + cargoHash = "sha256-SbX0jWaihabl90L7KfRfFakvTDIpJcDjsfOr36T8+Xg="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + openssl + docker + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Validate and execute GitHub Actions workflows locally"; + homepage = "https://github.com/bahdotsh/wrkflw"; + changelog = "https://github.com/bahdotsh/wrkflw/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + awwpotato + FKouhai + ]; + mainProgram = "wrkflw"; + }; +}) From f47d7861e24e6f3ac40fe909263e0bc43a92941f Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Wed, 23 Apr 2025 00:40:18 -0700 Subject: [PATCH 066/165] ovftool: use correct version of xercesc PR #378697 sat in limbo for a bit too long, so the xercesc version got out of date. Validated on both Darwin and Linux. --- pkgs/by-name/ov/ovftool/package.nix | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ov/ovftool/package.nix b/pkgs/by-name/ov/ovftool/package.nix index 8afd9a846ec9..67c8c1b9bd5f 100644 --- a/pkgs/by-name/ov/ovftool/package.nix +++ b/pkgs/by-name/ov/ovftool/package.nix @@ -85,6 +85,15 @@ let }; ovftoolSystem = ovftoolSystems.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); + + # Regrettably, we need to compile this version or else ovftool complains about unknown symbols. + ovftool-xercesc = xercesc.overrideAttrs (prev: rec { + version = "3.2.5"; + src = fetchurl { + url = lib.replaceStrings [ prev.version ] [ version ] prev.src.url; + hash = "sha256-VFz8zmxOdVIHvR8n4xkkHlDjfAwnJQ8RzaEWAY8e8PU="; + }; + }); in stdenv.mkDerivation (final: { pname = "ovftool"; @@ -111,7 +120,7 @@ stdenv.mkDerivation (final: { icu60 libiconv libxcrypt-legacy - xercesc + ovftool-xercesc zlib curl ] @@ -124,10 +133,14 @@ stdenv.mkDerivation (final: { libxml2 ]; - nativeBuildInputs = [ - unzip - makeWrapper - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = + [ + unzip + makeWrapper + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + autoPatchelfHook + ]; postUnpack = '' # The linux package wraps ovftool.bin with ovftool. Wrapping @@ -240,7 +253,7 @@ stdenv.mkDerivation (final: { change_args+=(-change @loader_path/lib/libexpat.dylib ${expat}/lib/libexpat.dylib) change_args+=(-change @loader_path/lib/libicudata.60.2.dylib ${icu60}/lib/libicudata.60.2.dylib) change_args+=(-change @loader_path/lib/libicuuc.60.2.dylib ${icu60}/lib/libicuuc.60.2.dylib) - change_args+=(-change @loader_path/lib/libxerces-c-3.2.dylib ${xercesc}/lib/libxerces-c-3.2.dylib) + change_args+=(-change @loader_path/lib/libxerces-c-3.2.dylib ${ovftool-xercesc}/lib/libxerces-c.dylib) # lolwut change_args+=(-change @GOBUILD_CAYMAN_CURL_ROOT@/apple_mac64/lib/libcurl.4.dylib ${curl.out}/lib/libcurl.4.dylib) @@ -255,7 +268,7 @@ stdenv.mkDerivation (final: { change_args+=(-change @loader_path/libexpat.dylib ${expat}/lib/libexpat.dylib) change_args+=(-change @loader_path/libicudata.60.2.dylib ${icu60}/lib/libicudata.60.2.dylib) change_args+=(-change @loader_path/libicuuc.60.2.dylib ${icu60}/lib/libicuuc.60.2.dylib) - change_args+=(-change @loader_path/libxerces-c-3.2.dylib ${xercesc}/lib/libxerces-c-3.2.dylib) + change_args+=(-change @loader_path/libxerces-c-3.2.dylib ${ovftool-xercesc}/lib/libxerces-c.dylib) # Add new absolute paths for other libs to all libs for lib in $out/lib/*.dylib; do From c07a02e97a0f1cbba7ec04e9a0ce7ba5d383d947 Mon Sep 17 00:00:00 2001 From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com> Date: Wed, 23 Apr 2025 11:22:34 +0200 Subject: [PATCH 067/165] magika: fix build failure --- pkgs/development/python-modules/magika/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/magika/default.nix b/pkgs/development/python-modules/magika/default.nix index 1c36250fcc08..42b4092d72b9 100644 --- a/pkgs/development/python-modules/magika/default.nix +++ b/pkgs/development/python-modules/magika/default.nix @@ -6,7 +6,7 @@ magika, numpy, onnxruntime, - poetry-core, + hatchling, python-dotenv, pythonOlder, stdenv, @@ -26,7 +26,7 @@ buildPythonPackage rec { hash = "sha256-490ixzk2Ywsc150PQS1tmlPcmbpeNwmxrFP1a8mY5jU="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ hatchling ]; propagatedBuildInputs = [ click From fee03a639b23442649c09b0bcc18af2b4eb30526 Mon Sep 17 00:00:00 2001 From: Louis Thevenet Date: Wed, 23 Apr 2025 11:47:38 +0200 Subject: [PATCH 068/165] television: 0.11.7 -> 0.11.9 --- pkgs/by-name/te/television/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix index a34769186644..40212e24475b 100644 --- a/pkgs/by-name/te/television/package.nix +++ b/pkgs/by-name/te/television/package.nix @@ -8,17 +8,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "television"; - version = "0.11.7"; + version = "0.11.9"; src = fetchFromGitHub { owner = "alexpasmantier"; repo = "television"; tag = finalAttrs.version; - hash = "sha256-cxbg7ic/LzQPfq5VFr9iSaEfL3SF1Aca1/SfXWCOTQo="; + hash = "sha256-9ug3MFBAvdOpA7Cw5eqCjS2gWK0InqlfUAOItE0o40s="; }; useFetchCargoVendor = true; - cargoHash = "sha256-T8m/B95PoKeIR7A8Kh6j1sicYlaUk6pb4os+XxC356U="; + cargoHash = "sha256-n417hrDLpBD7LhtHfqHPgr9N+gkdC9nw+iDnNRcTqQQ="; passthru = { tests.version = testers.testVersion { From 5c5f656c97d7d4e50cc933c7ad15fafbb7a75972 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Sat, 19 Apr 2025 20:05:21 -0700 Subject: [PATCH 069/165] dfilemanager: move to by-name --- .../df/dfilemanager/package.nix} | 22 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 12 insertions(+), 12 deletions(-) rename pkgs/{applications/file-managers/dfilemanager/default.nix => by-name/df/dfilemanager/package.nix} (66%) diff --git a/pkgs/applications/file-managers/dfilemanager/default.nix b/pkgs/by-name/df/dfilemanager/package.nix similarity index 66% rename from pkgs/applications/file-managers/dfilemanager/default.nix rename to pkgs/by-name/df/dfilemanager/package.nix index 44f2675f18d6..74d65f0ecc16 100644 --- a/pkgs/applications/file-managers/dfilemanager/default.nix +++ b/pkgs/by-name/df/dfilemanager/package.nix @@ -1,15 +1,13 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, cmake, + libsForQt5, file, - qtbase, - qttools, - solid, }: -mkDerivation { +stdenv.mkDerivation { pname = "dfilemanager"; version = "unstable-2021-02-20"; @@ -17,15 +15,18 @@ mkDerivation { owner = "probonopd"; repo = "dfilemanager"; rev = "61179500a92575e05cf9a71d401c388726bfd73d"; - sha256 = "sha256-BHd2dZDVxy82vR6PyXIS5M6zBGJ4bQfOhdBCdOww4kc="; + hash = "sha256-BHd2dZDVxy82vR6PyXIS5M6zBGJ4bQfOhdBCdOww4kc="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + libsForQt5.wrapQtAppsHook + ]; buildInputs = [ - qtbase - qttools + libsForQt5.qtbase + libsForQt5.qttools + libsForQt5.solid file - solid ]; cmakeFlags = [ "-DQT5BUILD=true" ]; @@ -36,5 +37,6 @@ mkDerivation { mainProgram = "dfm"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; + maintainers = [ ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 548a6291147d..cda54c7bcf27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13982,8 +13982,6 @@ with pkgs; dfasma = libsForQt5.callPackage ../applications/audio/dfasma { }; - dfilemanager = libsForQt5.callPackage ../applications/file-managers/dfilemanager { }; - direwolf = callPackage ../applications/radio/direwolf { hamlib = hamlib_4; }; From a2981a9cbc2a0dc59b8a49e8e5bdc77780bffa0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 15:30:12 +0000 Subject: [PATCH 070/165] esbuild: 0.25.2 -> 0.25.3 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 05563a439981..5b28fd230d7d 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.25.2"; + version = "0.25.3"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-aDxheDMeQYqCT9XO3In6RbmzmXVchn+bjgf3nL3VE4I="; + hash = "sha256-YYwvz6TCLAtVHsmXLGC+L/CQVAy5qSFU6JS1o5O5Zkg="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; From 8f560089a97bb5b05d34aaed3eba9762e7b81f53 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Wed, 23 Apr 2025 17:42:55 +0200 Subject: [PATCH 071/165] hypseus-singe: 2.11.3 -> 2.11.4 --- pkgs/by-name/hy/hypseus-singe/package.nix | 9 ++++++--- pkgs/by-name/hy/hypseus-singe/use-shared-mpeg2.patch | 7 ++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/hy/hypseus-singe/package.nix b/pkgs/by-name/hy/hypseus-singe/package.nix index 275c276f0455..ae4e63657fbe 100644 --- a/pkgs/by-name/hy/hypseus-singe/package.nix +++ b/pkgs/by-name/hy/hypseus-singe/package.nix @@ -11,6 +11,7 @@ SDL2, SDL2_image, SDL2_ttf, + SDL2_mixer, libmpeg2, libvorbis, libzip, @@ -19,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hypseus-singe"; - version = "2.11.3"; + version = "2.11.4"; src = fetchFromGitHub { owner = "DirtBagXon"; repo = "hypseus-singe"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-hLl+/tJrBXo6m/cJxmn2bSLXcNLM8B6SKrM702Z8K8E="; + tag = "v${finalAttrs.version}"; + hash = "sha256-04WC0fO/eNUz4muwDAbjDy5AA53QPpX5dq5Xgt8qeBI="; }; patches = [ ./use-shared-mpeg2.patch ]; @@ -44,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 SDL2_image SDL2_ttf + SDL2_mixer libmpeg2 libvorbis libzip @@ -55,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = toString [ "-I${lib.getDev SDL2_image}/include/SDL2" "-I${lib.getDev SDL2_ttf}/include/SDL2" + "-I${lib.getDev SDL2_mixer}/include/SDL2" ]; preConfigure = '' diff --git a/pkgs/by-name/hy/hypseus-singe/use-shared-mpeg2.patch b/pkgs/by-name/hy/hypseus-singe/use-shared-mpeg2.patch index 3348146e3ddc..f1118d9e45b6 100644 --- a/pkgs/by-name/hy/hypseus-singe/use-shared-mpeg2.patch +++ b/pkgs/by-name/hy/hypseus-singe/use-shared-mpeg2.patch @@ -1,8 +1,8 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 6a85063..73dbd39 100644 +index 780b802..2f0b489 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -50,13 +50,12 @@ include(GetGitRevisionDescription) +@@ -53,14 +53,13 @@ include(GetGitRevisionDescription) include(InstallRequiredSystemLibraries) include(FindPkgConfig) include(ExternalProject) @@ -12,12 +12,13 @@ index 6a85063..73dbd39 100644 PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2) PKG_SEARCH_MODULE(SDL2_TTF REQUIRED SDL2_ttf) + PKG_SEARCH_MODULE(SDL2_MIXER REQUIRED SDL2_mixer) -build_libmpeg2( ) +PKG_SEARCH_MODULE(MPEG2 REQUIRED libmpeg2) message(STATUS "Target: ${CMAKE_SYSTEM_NAME} ${CMAKE_TARGET_ARCHITECTURES}") -@@ -110,7 +109,6 @@ add_subdirectory(timer) +@@ -114,7 +113,6 @@ add_subdirectory(timer) add_subdirectory(video) add_subdirectory(vldp) From 9e1302b6509e5fa1e4c433e92e5dabfb37e64832 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 15:46:55 +0000 Subject: [PATCH 072/165] cables: 0.5.11 -> 0.5.12 --- pkgs/by-name/ca/cables/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/cables/package.nix b/pkgs/by-name/ca/cables/package.nix index 051a2be17e1a..6f24fa393c6f 100644 --- a/pkgs/by-name/ca/cables/package.nix +++ b/pkgs/by-name/ca/cables/package.nix @@ -7,12 +7,12 @@ let pname = "cables"; - version = "0.5.11"; + version = "0.5.12"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/cables-gl/cables_electron/releases/download/v${version}/cables-${version}-linux-x64.AppImage"; - sha256 = "sha256-d6IKORuySXrVk5ifevtPlposSuxk7n9b/dxD8CRfdMQ="; + sha256 = "sha256-uQWfll9aYVNmR9Sw0PnupxY6n/gv+nV0pIttsmzGM9A="; }; appimageContents = appimageTools.extract { From 0d668d325522e8420aad3b9b79ff3dac58690d8f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 18:38:47 +0000 Subject: [PATCH 073/165] jira-cli-go: 1.5.2 -> 1.6.0 --- pkgs/by-name/ji/jira-cli-go/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ji/jira-cli-go/package.nix b/pkgs/by-name/ji/jira-cli-go/package.nix index 52a4376d9d78..bf9d519ef8b9 100644 --- a/pkgs/by-name/ji/jira-cli-go/package.nix +++ b/pkgs/by-name/ji/jira-cli-go/package.nix @@ -13,16 +13,16 @@ buildGoModule rec { pname = "jira-cli-go"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "ankitpokhrel"; repo = "jira-cli"; tag = "v${version}"; - hash = "sha256-Wp6uDvnTiNixn8GyEn8SeKPdXanUNN3b7yr9dT1D6uo="; + hash = "sha256-+7R0yf7YVUnJErvhDm6dVskAJdyd7DHM0JJ6V9gzj/Q="; }; - vendorHash = "sha256-a11ZO/iV/Yhaq/cu504p2C/OkKJ04PeMMSoHrl7edvM="; + vendorHash = "sha256-cl+Sfi9WSPy8qOtB13rRiKtQdDC+HC0+FMKpsWbtU2w="; nativeBuildInputs = [ installShellFiles ]; From c456f8cedcd8c4ae78c0d2de9793a2a32fa71b22 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 18:50:13 +0000 Subject: [PATCH 074/165] tanka: 0.31.3 -> 0.32.0 --- pkgs/by-name/ta/tanka/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/tanka/package.nix b/pkgs/by-name/ta/tanka/package.nix index 2256bdffd70c..0dda8eec080c 100644 --- a/pkgs/by-name/ta/tanka/package.nix +++ b/pkgs/by-name/ta/tanka/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "tanka"; - version = "0.31.3"; + version = "0.32.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MaWO9I2+xHA+55tUSQ91yJ7suubnWP4V7JxZTruN1A0="; + sha256 = "sha256-+875PMDATNarFhnAhpi9QxBNgV9irrjRWd/hHsqlH+c="; }; - vendorHash = "sha256-jTvKNl0L+Dl3u5qHQg0R/rtNtLljLoIvciXYKRe/zNg="; + vendorHash = "sha256-pgtkTpEnRBjao/78Zc8qVJXZGRmKbO5wIy/7G4y0DgU="; doCheck = false; # Required for versions >= 0.28 as they introduce a gowork.sum file. This is only used for tests so we can safely disable GOWORK From 10eff87746139d6335afc702940b86f59b9e2b35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 18:54:27 +0000 Subject: [PATCH 075/165] syn2mas: 0.14.1 -> 0.15.0 --- pkgs/by-name/sy/syn2mas/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/syn2mas/package.nix b/pkgs/by-name/sy/syn2mas/package.nix index 7fb4efaecba9..5e98fd15467a 100644 --- a/pkgs/by-name/sy/syn2mas/package.nix +++ b/pkgs/by-name/sy/syn2mas/package.nix @@ -6,18 +6,18 @@ buildNpmPackage rec { pname = "syn2mas"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "element-hq"; repo = "matrix-authentication-service"; rev = "v${version}"; - hash = "sha256-s6LVCISmbG3ubY/67DcUUE/pnTJSE0v9n8INmLMQNcw="; + hash = "sha256-RK58yfsPJirOKHyBnth42sLTkWo+AkMylEigH0w/RWc="; }; sourceRoot = "${src.name}/tools/syn2mas"; - npmDepsHash = "sha256-H3N0wm7M9GUvB32fch2TWulmmcU5Cb3SuWLkOkIZBqY="; + npmDepsHash = "sha256-RzZjTKS4d/n9mIJ+eUY7NlqWssCnJ2Yh2nAMwasY8Fk="; dontBuild = true; From 10e56f829379c11b1fcb3f6f4f60a429953d8016 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 20:35:56 +0000 Subject: [PATCH 076/165] terraform-providers.mongodbatlas: 1.32.0 -> 1.33.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index accf1bb287a2..03ff23eb8417 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -831,13 +831,13 @@ "vendorHash": "sha256-1nm2Y4T9/mCWMXMjXEzBz3w08AYHjQJeb9mYPQeWPs0=" }, "mongodbatlas": { - "hash": "sha256-V1kQPFNW0/C1Rw6gbHpQ1+yK5L8dO+zFIHkQs93a56Y=", + "hash": "sha256-9fgaBOzly/B1kTvTmevoaEHs6s3/i3kGokFqzKWKwwg=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.32.0", + "rev": "v1.33.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-VznDrCvaY6O8n1bl/fx/PIdKfFD32pQaGn5Ti1sJucU=" + "vendorHash": "sha256-yKNhCFxs2BRU4X9P7ZREmR64u5/8QFFGMk8khXyqUsA=" }, "namecheap": { "hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=", From 761022ccd727db73edfbb1e8d4355bc6551f9e41 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 20:56:00 +0000 Subject: [PATCH 077/165] sonarlint-ls: 3.20.0.76057 -> 3.20.1.76068 --- pkgs/by-name/so/sonarlint-ls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/sonarlint-ls/package.nix b/pkgs/by-name/so/sonarlint-ls/package.nix index 1db982b38c7b..bbc552e6eeae 100644 --- a/pkgs/by-name/so/sonarlint-ls/package.nix +++ b/pkgs/by-name/so/sonarlint-ls/package.nix @@ -16,17 +16,17 @@ maven.buildMavenPackage rec { pname = "sonarlint-ls"; - version = "3.20.0.76057"; + version = "3.20.1.76068"; src = fetchFromGitHub { owner = "SonarSource"; repo = "sonarlint-language-server"; rev = version; - hash = "sha256-O02KxAIOKhHBkxjLSsc2Pw7VkR0IsyA/kpCu4f1urTE="; + hash = "sha256-sM0/L6li314/j//hTDpSKr+XimWY5EZiC1d0CVKoWmw="; }; mvnJdk = jdk17; - mvnHash = "sha256-yFzT0v7u23b/r8Pe+wuSXlwc4rN5DJ9ezmtlcWVMj7k="; + mvnHash = "sha256-aF2lQhed7EN6l3Nwu90x3b4mzwfXyZNCYE8fLMU1Ln0="; # Disables failing tests which either need network access or are flaky. mvnParameters = lib.escapeShellArgs [ From f9ac1cd69ab7d35ddd8f75e8be3aacac034a5cb4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 21:01:34 +0000 Subject: [PATCH 078/165] gpxsee: 13.38 -> 13.40 --- pkgs/applications/misc/gpxsee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 1f48013eb408..f98e03745e5c 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.38"; + version = "13.40"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; tag = finalAttrs.version; - hash = "sha256-ftVuFuoseXtpeXzOMZA66O2Z6wxKd7G6l3Kx8WOgor0="; + hash = "sha256-xxMnqUsYfmTD1ZNAm+lFMLvXvo6qRrq88m234ZtYiuA="; }; buildInputs = From f2e4a214976c849d8e9b42494337f6f221f5640c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 21:04:40 +0000 Subject: [PATCH 079/165] beeper: 4.0.623 -> 4.0.640 --- pkgs/by-name/be/beeper/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index eba68ca2380e..6e4d1654d8c1 100644 --- a/pkgs/by-name/be/beeper/package.nix +++ b/pkgs/by-name/be/beeper/package.nix @@ -9,10 +9,10 @@ }: let pname = "beeper"; - version = "4.0.623"; + version = "4.0.640"; src = fetchurl { url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}.AppImage"; - hash = "sha256-K043RQ5BoS1ysnmY+LpRixBmMx2XCbRzhWnWsxg26dg="; + hash = "sha256-hYbTYvfrTpRPRwXXgNCqKeEtiRpuLj6sYIYnfJ3aMv4="; }; appimageContents = appimageTools.extract { inherit version pname src; From 844fab7dda81938f92b508e988529f43b5b8d2ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 22:07:57 +0000 Subject: [PATCH 080/165] cnquery: 11.49.0 -> 11.51.1 --- pkgs/by-name/cn/cnquery/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix index 1011182dd86b..cc9f47319d38 100644 --- a/pkgs/by-name/cn/cnquery/package.nix +++ b/pkgs/by-name/cn/cnquery/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnquery"; - version = "11.49.0"; + version = "11.51.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; tag = "v${version}"; - hash = "sha256-e/tD/yo7tV2JkQER1KW9qO9YIo2TQR3jt8uYup/wEt4="; + hash = "sha256-Vc6ucWZf/n/joscFEVuQEfsg2fu860thmlppVItFDnE="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-M3pRUXAwXgdWLaEMXRd6hkH4Z2hh4z38SzO6BeOzjeo="; + vendorHash = "sha256-gvRsEIYEj5D+P8gFlGdfHC/3Pho5YYZxKm6Mkq8lwQw="; ldflags = [ "-w" From a4df39f2b2682c7516116f17de871a9293bfdef2 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Thu, 24 Apr 2025 01:33:48 +0300 Subject: [PATCH 081/165] nixos/nh: change `FLAKE` variable to `NH_FLAKE`; improve option documentation --- nixos/modules/programs/nh.nix | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/nixos/modules/programs/nh.nix b/nixos/modules/programs/nh.nix index 21ffa5cc17d2..321893f4bd23 100644 --- a/nixos/modules/programs/nh.nix +++ b/nixos/modules/programs/nh.nix @@ -8,7 +8,10 @@ let cfg = config.programs.nh; in { - meta.maintainers = [ lib.maintainers.viperML ]; + meta.maintainers = with lib.maintainers; [ + NotAShelf + viperML + ]; options.programs.nh = { enable = lib.mkEnableOption "nh, yet another Nix CLI helper"; @@ -19,9 +22,18 @@ in type = lib.types.nullOr lib.types.path; default = null; description = '' - The path that will be used for the `FLAKE` environment variable. + The path that will be used for the `NH_FLAKE` environment variable. - `FLAKE` is used by nh as the default flake for performing actions, like `nh os switch`. + `NH_FLAKE` is used by nh as the default flake for performing actions, such as + `nh os switch`. This behaviour can be overriden per-command with environment + variables that will take priority. + + - `NH_OS_FLAKE`: will take priority for `nh os` commands. + - `NH_HOME_FLAKE`: will take priority for `nh home` commands. + - `NH_DARWIN_FLAKE`: will take priority for `nh darwin` commands. + + The formerly valid `FLAKE` is now deprecated by nh, and will cause hard errors + in future releases if `NH_FLAKE` is not set. ''; }; @@ -77,7 +89,7 @@ in environment = lib.mkIf cfg.enable { systemPackages = [ cfg.package ]; variables = lib.mkIf (cfg.flake != null) { - FLAKE = cfg.flake; + NH_FLAKE = cfg.flake; }; }; From 83d8efb5eb082a44baffdb91a7d27c68f3a1882b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 23:44:20 +0000 Subject: [PATCH 082/165] terraform-providers.grafana: 3.22.2 -> 3.22.3 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index accf1bb287a2..ee70d75dc7d5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -534,13 +534,13 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-uWRFi0jYGwlZ1b8qvVoL/NslI6e5bv76QmlWL5C7fA8=", + "hash": "sha256-uPvG2/miG5CCZkSinFwGUj1wmGBPyI2jCkYS31559NY=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v3.22.2", + "rev": "v3.22.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-wqGNczKE2IFq/wLb8fj5+k07Vh1dR1oXwW06fIWV6Eg=" + "vendorHash": "sha256-8KsQan5KxNj3/NSzj/M+IR44PiQ5E7PL/K4vVC5KovA=" }, "gridscale": { "hash": "sha256-Ygt3L/dzwycccQZmuwbcaLHp9FBGNHgU19wSNmY8PzQ=", From 09af23b0583842361e01c11b15a08cca0e2fac79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 00:02:40 +0000 Subject: [PATCH 083/165] python312Packages.peft: 0.15.1 -> 0.15.2 --- pkgs/development/python-modules/peft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peft/default.nix b/pkgs/development/python-modules/peft/default.nix index e93638f1bff3..07caadc59cd7 100644 --- a/pkgs/development/python-modules/peft/default.nix +++ b/pkgs/development/python-modules/peft/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "peft"; - version = "0.15.1"; + version = "0.15.2"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "peft"; tag = "v${version}"; - hash = "sha256-oGDRGg1FmDJPFyDy6n4CiWmQjG0VibW7tLXYGBNq25c="; + hash = "sha256-c9oHBQCdJpPAeI7xwePXx75Sp39I8QVjRZSxxSOm2PM="; }; build-system = [ setuptools ]; From ee25a0df1cde42dee1814ea7342a3e78a9acb61e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 00:13:26 +0000 Subject: [PATCH 084/165] glooctl: 1.18.14 -> 1.18.16 --- pkgs/by-name/gl/glooctl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix index e2661f72d91f..670cf1a072b9 100644 --- a/pkgs/by-name/gl/glooctl/package.nix +++ b/pkgs/by-name/gl/glooctl/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.18.14"; + version = "1.18.16"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-NFcUSvtoXTXGLOGKsf6620R80b19ce++gfG5njDyvI0="; + hash = "sha256-+GQLmmIU+b7GczeypHZ+Z3UyOafWrAUBgtVFMJV+WSE="; }; vendorHash = "sha256-lcnsmeZ2XobBE95KqIhUZCKmevg2WEGuZC4qUVkdafM="; From f8641c7aaba856f2ff631fd539edcc6f84c56ee2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 00:49:34 +0000 Subject: [PATCH 085/165] atlas: 0.32.0 -> 0.32.1 --- pkgs/by-name/at/atlas/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/at/atlas/package.nix b/pkgs/by-name/at/atlas/package.nix index 15d78b50a60f..cb0687ada1e3 100644 --- a/pkgs/by-name/at/atlas/package.nix +++ b/pkgs/by-name/at/atlas/package.nix @@ -8,19 +8,19 @@ buildGoModule (finalAttrs: { pname = "atlas"; - version = "0.32.0"; + version = "0.32.1"; src = fetchFromGitHub { owner = "ariga"; repo = "atlas"; rev = "v${finalAttrs.version}"; - hash = "sha256-iM+Qy8tQAjonXpt36WWIEIAmtqnR0wWtMMxIh76Fv0U="; + hash = "sha256-1uPOS5r13nGNAPxCCphrmWyvxg+OoopMP0U/VhR+gDQ="; }; modRoot = "cmd/atlas"; proxyVendor = true; - vendorHash = "sha256-kSKxZmguHasRlxI3h2Gm/0sj8dQwUd8F9bL1yp6stRE="; + vendorHash = "sha256-K94zOisolCplE/cFrWmv4/MWl5DD27lRekPTl+o4Jwk="; nativeBuildInputs = [ installShellFiles ]; From 11aafe5230a0604c0a7291140ba08770727db5b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 00:56:48 +0000 Subject: [PATCH 086/165] railway: 4.0.0 -> 4.0.1 --- pkgs/by-name/ra/railway/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix index 1fd672670492..09e1f8ab6c9f 100644 --- a/pkgs/by-name/ra/railway/package.nix +++ b/pkgs/by-name/ra/railway/package.nix @@ -12,17 +12,17 @@ let in rustPlatform.buildRustPackage rec { pname = "railway"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-o3AWcUKeOBiNsDSDV0XFzQ0rWpj7el4qX6iQKnqMPgg="; + hash = "sha256-2qVib63l+NSiHPD9qDoZiRG1t7SCyqJEUpUI60UMneA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-F+1ELwvtjnaQlvkfdKk7hnuEEde4NL/sUjPBExU+zds="; + cargoHash = "sha256-p9KH8UhblE4+bKJrkiHvAg77WI2f6KVbIJ4wuUniqDU="; nativeBuildInputs = [ pkg-config ]; From d1a8eb518fc8c0a553cf784a0d911ef0916aea4b Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Wed, 23 Apr 2025 19:30:24 -0600 Subject: [PATCH 087/165] freetube: 0.23.3 -> 0.23.4 Diff: https://github.com/FreeTubeApp/FreeTube/compare/v0.23.3-beta...v0.23.4-beta --- pkgs/by-name/fr/freetube/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix index 88973a0fa160..8c352ffb7883 100644 --- a/pkgs/by-name/fr/freetube/package.nix +++ b/pkgs/by-name/fr/freetube/package.nix @@ -20,13 +20,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "freetube"; - version = "0.23.3"; + version = "0.23.4"; src = fetchFromGitHub { owner = "FreeTubeApp"; repo = "FreeTube"; tag = "v${finalAttrs.version}-beta"; - hash = "sha256-EpcYNUtGbEFvetroo1zAyfKxW70vD1Lk0aJKWcaV39I="; + hash = "sha256-JQob4NyZ00iOnRbSyNWjL4xyNQ14ixyZDXsJ7KBd9ZM="; }; # Darwin requires writable Electron dist @@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-xiJGzvmfrvvB6/rdwALOxhWSWAZ31cbySYygtG8+QpQ="; + hash = "sha256-F1YcdshWGRCO7kHsCK0Ejs0aMR7BFXd5M9ITdRVcpbk="; }; nativeBuildInputs = [ From 85e53354acdfa5a1c96e6d14a35457da905f9123 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 02:00:10 +0000 Subject: [PATCH 088/165] python312Packages.rq: 2.3.1 -> 2.3.2 --- pkgs/development/python-modules/rq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index d2f19053892c..a0f150e473f0 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "rq"; - version = "2.3.1"; + version = "2.3.2"; pyproject = true; src = fetchFromGitHub { owner = "rq"; repo = "rq"; tag = "v${version}"; - hash = "sha256-RnnYO6gKhbcft61EhTFbfvhC+9SsVfDsu64GuNfGKvE="; + hash = "sha256-odO4DSuLNyGndj+n++DupAyOUywYJtnmkO0lUM1xS2I="; }; build-system = [ hatchling ]; From 2d0dae29a3051ffa605c48a903f5d4c4499f9f29 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 02:25:25 +0000 Subject: [PATCH 089/165] kubecm: 0.32.3 -> 0.33.0 --- pkgs/by-name/ku/kubecm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubecm/package.nix b/pkgs/by-name/ku/kubecm/package.nix index 476ed8e114f2..52bbbd0ac204 100644 --- a/pkgs/by-name/ku/kubecm/package.nix +++ b/pkgs/by-name/ku/kubecm/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubecm"; - version = "0.32.3"; + version = "0.33.0"; src = fetchFromGitHub { owner = "sunny0826"; repo = "kubecm"; rev = "v${version}"; - hash = "sha256-z0uQhAfyrK2LKs4hwnHGE7hKQwhLGCmp7yN58ehDn/w="; + hash = "sha256-osyxgwJIHsnTW8uDKPFO174ImUntKHmW61v6KPY1E9M="; }; - vendorHash = "sha256-2GFZ++7H0ii+9WJKPxtDBHikJTQQyDFqJ6qzwVvA84g="; + vendorHash = "sha256-rSha+Fd8vohRnLjECqRn3Zg4DYxGgXc4M7mUAgvW+Gw="; ldflags = [ "-s" "-w" From d04832ade2c682cbad599d981be4148c2f63a226 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 02:27:23 +0000 Subject: [PATCH 090/165] terraform-providers.datadog: 3.59.1 -> 3.60.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index accf1bb287a2..4501f6e3a1fd 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -317,13 +317,13 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-7V4nSuksCvy2fSyQbzVo0RlEaevUwCIlX61y3GEBqVk=", + "hash": "sha256-bRC17BNrJYaEcqRUuuywhCAJSHe/NLJ5syayQGk8k6k=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.59.1", + "rev": "v3.60.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-vOg972dcpX9MEZ/GaPGcm0OIC1xu+p6KMcflEUPx0hU=" + "vendorHash": "sha256-Q3D0YEJkDKiDOqUIewATOrctHbLDEn85EFEgyUW9W+8=" }, "deno": { "hash": "sha256-7IvJrhXMeAmf8e21QBdYNSJyVMEzLpat4Tm4zHWglW8=", From e976216376d8ccabcd677bb9159f71e844659679 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 02:50:19 +0000 Subject: [PATCH 091/165] melange: 0.23.6 -> 0.23.9 --- pkgs/by-name/me/melange/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/melange/package.nix b/pkgs/by-name/me/melange/package.nix index bd7353cdcb1d..c0189fbc042d 100644 --- a/pkgs/by-name/me/melange/package.nix +++ b/pkgs/by-name/me/melange/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "melange"; - version = "0.23.6"; + version = "0.23.9"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-ahvYLj80fT93F2w22W7oD45mt3NAVpAhqKxqj4Hb1wY="; + hash = "sha256-HJNB3SCy54v9Tvc6qXT3jisWcqhUCT0evjJxjCltazc="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -26,7 +26,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-hmbdq4h1+8rIn8rbG0ZYNaimSiFROk3rTX1VhPPE200="; + vendorHash = "sha256-uxEQR6NuNJDtjXY5nPBkVU/1ExpdvTGOIpMTRjz68I8="; subPackages = [ "." ]; From c46df298d430339da8c749ce5bf7e418cdb384f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 02:58:15 +0000 Subject: [PATCH 092/165] junction: 1.8 -> 1.9 --- pkgs/by-name/ju/junction/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ju/junction/package.nix b/pkgs/by-name/ju/junction/package.nix index 23f0887f7c23..4de972bcb5cc 100644 --- a/pkgs/by-name/ju/junction/package.nix +++ b/pkgs/by-name/ju/junction/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "junction"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "sonnyp"; repo = "junction"; rev = "v${version}"; - hash = "sha256-0zY6Dp0aKHtBHSTiGbI5o6876BsARbo8/BbArl0RaMY="; + hash = "sha256-gnFig8C46x73gAUl9VVx3Y3hrhEVeP/DvaYHYuv9RTg="; fetchSubmodules = true; }; From cedb8eab9a4ea9f482a5e3811220890c57e20161 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 03:47:16 +0000 Subject: [PATCH 093/165] uv-sort: 0.5.0 -> 0.5.1 --- pkgs/by-name/uv/uv-sort/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/uv/uv-sort/package.nix b/pkgs/by-name/uv/uv-sort/package.nix index 5ef3a21e9d7d..52ce3dd9471d 100644 --- a/pkgs/by-name/uv/uv-sort/package.nix +++ b/pkgs/by-name/uv/uv-sort/package.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { pname = "uv-sort"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; # Build from GitHub does not work. Use fetchPypi instead of fetchFromGitHub. @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { pname = "uv_sort"; inherit version; - hash = "sha256-qCShDuKBFS4omcsntZ1wzRtAKTbp8CfTw0IIAgxBvcE="; + hash = "sha256-d0mI3BQQaoG5pPnqBqyAI2LQffkS9fxX+itD9UEL050="; }; build-system = with python3Packages; [ From 7446381d442b98b5e1a747d7b03b12fdc587af75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 04:03:59 +0000 Subject: [PATCH 094/165] python312Packages.gdsfactory: 9.5.1 -> 9.5.2 --- pkgs/development/python-modules/gdsfactory/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gdsfactory/default.nix b/pkgs/development/python-modules/gdsfactory/default.nix index 0499fd810b80..cfd04c5ec56a 100644 --- a/pkgs/development/python-modules/gdsfactory/default.nix +++ b/pkgs/development/python-modules/gdsfactory/default.nix @@ -46,14 +46,14 @@ }: buildPythonPackage rec { pname = "gdsfactory"; - version = "9.5.1"; + version = "9.5.2"; pyproject = true; src = fetchFromGitHub { owner = "gdsfactory"; repo = "gdsfactory"; tag = "v${version}"; - hash = "sha256-z8zKPbWLl554MZq6/Iy3ecvwWiRpy57VYji8xHR+JBo="; + hash = "sha256-BcFEMcHt0qUQ0hTLSznuIH37rAk+10JGrPdrhE/sTfU="; }; build-system = [ flit-core ]; @@ -111,7 +111,7 @@ buildPythonPackage rec { meta = { description = "Python library to generate GDS layouts"; homepage = "https://github.com/gdsfactory/gdsfactory"; - changelog = "https://github.com/gdsfactory/gdsfactory/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/gdsfactory/gdsfactory/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fbeffa ]; }; From 3901e62af36717973d9550cd6793df49b3503940 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 04:24:13 +0000 Subject: [PATCH 095/165] kargo: 1.4.1 -> 1.4.3 --- pkgs/by-name/ka/kargo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ka/kargo/package.nix b/pkgs/by-name/ka/kargo/package.nix index 674b81ec60dc..398c38e263e6 100644 --- a/pkgs/by-name/ka/kargo/package.nix +++ b/pkgs/by-name/ka/kargo/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "kargo"; - version = "1.4.1"; + version = "1.4.3"; src = fetchFromGitHub { owner = "akuity"; repo = "kargo"; tag = "v${version}"; - hash = "sha256-yLBq3zc9GcuLaS/Muup+15vpj99bHV2ImGvL4UuMuj4="; + hash = "sha256-qrMvEVKOUsRjIfnY/u7o56oPxCWXZbj+XU6c8/7fugQ="; }; vendorHash = "sha256-1J/9AXKU6jLZh6B5jWCoQeStborTOGjxFkZ1Vk2Yw+8="; From 55295b8aa25633e4e76a2c4d2e558b8efdd67b13 Mon Sep 17 00:00:00 2001 From: emaryn Date: Thu, 24 Apr 2025 12:26:03 +0800 Subject: [PATCH 096/165] geekbench: 6.3.0 -> 6.4.0 --- pkgs/tools/misc/geekbench/6.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/geekbench/6.nix b/pkgs/tools/misc/geekbench/6.nix index 26abefa16ae4..41ff65ced4e0 100644 --- a/pkgs/tools/misc/geekbench/6.nix +++ b/pkgs/tools/misc/geekbench/6.nix @@ -11,15 +11,15 @@ let inherit (stdenv.hostPlatform.uname) processor; - version = "6.3.0"; + version = "6.4.0"; sources = { "x86_64-linux" = { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - hash = "sha256-AXJ5mXGc1RWnIkB13KtIdt7vKETEXowunzQZciQDnzs="; + hash = "sha256-Q4MwU3dIFheKKSMxzCBZI8XoForaN41BuRGVMhJaUKw="; }; "aarch64-linux" = { url = "https://cdn.geekbench.com/Geekbench-${version}-LinuxARMPreview.tar.gz"; - hash = "sha256-fbf01qa9wx3k9j8AEqv38fAM3F9tZOcnpH/wa/9rawQ="; + hash = "sha256-PZ95w2X4sqTLZGZ5wygt7WjSK4Gfgtdh/UCPo+8Ysc8="; }; }; geekbench_avx2 = lib.optionalString stdenv.hostPlatform.isx86_64 "geekbench_avx2"; @@ -62,12 +62,12 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with lib; { + meta = { description = "Cross-platform benchmark"; homepage = "https://geekbench.com/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - maintainers = with maintainers; [ + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ michalrus asininemonkey ]; From 1d86bf6a77b28b1f14687a3fa45adb41b3e0f5e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 05:08:35 +0000 Subject: [PATCH 097/165] terraform-providers.rootly: 2.26.5 -> 2.26.8 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index accf1bb287a2..a8a0ce2d8022 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1102,11 +1102,11 @@ "vendorHash": "sha256-lkooWo0DbpL4zjNQ20TRw+hsHXWZP9u7u95n1WyzTQk=" }, "rootly": { - "hash": "sha256-bIn3TshuK06MCNznghPeFS5jfFMshz2Zmc9DKoHUEWs=", + "hash": "sha256-HvUvRDoRalOzHHnCM0uBR+xc0i0ItfglgoJ0H1QLovg=", "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly", "owner": "rootlyhq", "repo": "terraform-provider-rootly", - "rev": "v2.26.5", + "rev": "v2.26.8", "spdx": "MPL-2.0", "vendorHash": "sha256-IJJjA7SCQib5GdqbS2rnZtbBNB8sYYPYH+vHMGf1Bfk=" }, From cf5dd160dfd74ccb6928e363158b12b1c0ff7802 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 05:31:52 +0000 Subject: [PATCH 098/165] google-cloud-sql-proxy: 2.15.2 -> 2.15.3 --- pkgs/by-name/go/google-cloud-sql-proxy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix index 1a5ad6bd543c..df5b2bf40386 100644 --- a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix +++ b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "google-cloud-sql-proxy"; - version = "2.15.2"; + version = "2.15.3"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "cloud-sql-proxy"; rev = "v${version}"; - hash = "sha256-IZSWJhA3M+d16KKOY6MULibvTNrf7InuNR/ahYznQHY="; + hash = "sha256-B9r4It6YQVBJ4tVX7IUI5jc6X3WgkgdzAcP0EWKUkeE="; }; subPackages = [ "." ]; - vendorHash = "sha256-iFCM1goZSYCCPC+14diCeK7AqLC+tRRSG10C8Nn0Lp0="; + vendorHash = "sha256-7QGetVfoDw59Mw1ZZh5wKEmqwxEgn3QP9kML+822dLc="; checkFlags = [ "-short" From 24b2cfeee01b8dd22fee88c738f259fbfc113f25 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 24 Apr 2025 06:55:28 +0100 Subject: [PATCH 099/165] rust-analyzer-unwrapped: 2025-04-14 -> 2025-04-21 Changes: https://github.com/rust-lang/rust-analyzer/releases/tag/2025-04-21 --- pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix index 1c298f6537f5..0fc9cb4e7640 100644 --- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix +++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2025-04-14"; + version = "2025-04-21"; useFetchCargoVendor = true; cargoHash = "sha256-6HKx3zm6RaixTiioij/PI2KvgWGhPFfVQsbECm4LtEc="; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - hash = "sha256-NPUnfDAwLD69aKetxjC7lV5ysrvs1IKC0Sy4Zai10Mw="; + hash = "sha256-Gw627dJW6/IJydIUCQnI8c2oilpMxhZIwHb7ppGX7hk="; }; cargoBuildFlags = [ From a9f9c9878e22a4f35e3662b399dee818d90a150b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 07:33:33 +0000 Subject: [PATCH 100/165] python312Packages.mdformat-mkdocs: 4.1.1 -> 4.1.2 --- pkgs/development/python-modules/mdformat-mkdocs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix index b48f9abb3a37..40940a338239 100644 --- a/pkgs/development/python-modules/mdformat-mkdocs/default.nix +++ b/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "mdformat-mkdocs"; - version = "4.1.1"; + version = "4.1.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "KyleKing"; repo = "mdformat-mkdocs"; tag = "v${version}"; - hash = "sha256-KH0edaqH5STRYtcSqbR0uTdlZVKuHRS7AUgd25fjvEE="; + hash = "sha256-+2w7UrOPSCUDc6jnLAW0/njq+aJ4y+H8n7gshxLj8/Q="; }; nativeBuildInputs = [ flit-core ]; From 47789abb87007ce5013b0a1f98b78b83d5103cb8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 07:38:39 +0000 Subject: [PATCH 101/165] python312Packages.seabreeze: 2.10.0 -> 2.10.1 --- pkgs/development/python-modules/seabreeze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix index f662e223b1e2..d4244bbcdfef 100644 --- a/pkgs/development/python-modules/seabreeze/default.nix +++ b/pkgs/development/python-modules/seabreeze/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "seabreeze"; - version = "2.10.0"; + version = "2.10.1"; pyproject = true; src = fetchFromGitHub { owner = "ap--"; repo = "python-seabreeze"; tag = "v${version}"; - hash = "sha256-HXcNXVziSscP532dSx35eS0ZHuJEPC6I9Nc95N90mVQ="; + hash = "sha256-q4qBblebCb5z67KgWBIzsvCWNZf146I7LHPCyAabDUM="; leaveDotGit = true; }; From 9b14aa66c0f0c597278d681a6e4c64cc4de5ccc7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 08:19:25 +0000 Subject: [PATCH 102/165] cyberpunk-neon: 0-unstable-2025-02-01 -> 0-unstable-2025-04-17 --- pkgs/by-name/cy/cyberpunk-neon/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cy/cyberpunk-neon/package.nix b/pkgs/by-name/cy/cyberpunk-neon/package.nix index 4c8d177fdd08..265f73e7c9bb 100644 --- a/pkgs/by-name/cy/cyberpunk-neon/package.nix +++ b/pkgs/by-name/cy/cyberpunk-neon/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation { pname = "cyberpunk-neon"; - version = "0-unstable-2025-02-01"; + version = "0-unstable-2025-04-17"; src = fetchFromGitHub { owner = "Roboron3042"; repo = "Cyberpunk-Neon"; - rev = "eb7595459c0d4164262e0ccaf8d6e5c1936a6f67"; - hash = "sha256-whHBIxEGGvTPVUaE/HQDb/Qyl5sPMGlOmofgNCBaNng="; + rev = "84f4817bf6e84fc24c3a93371f8de36613d76fa1"; + hash = "sha256-aCQ0BfDrKUH+ati9oiLh4iGc0eoyt2d7Zyg5yXwZe30="; }; outputs = [ From 1f479ee37bdda474ba986da3118c13f814850da8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 08:21:55 +0000 Subject: [PATCH 103/165] wavebox: 10.135.15-2 -> 10.135.21-2 --- pkgs/by-name/wa/wavebox/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/wavebox/package.nix b/pkgs/by-name/wa/wavebox/package.nix index fabb5162c298..3152399e1b39 100644 --- a/pkgs/by-name/wa/wavebox/package.nix +++ b/pkgs/by-name/wa/wavebox/package.nix @@ -156,11 +156,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "wavebox"; - version = "10.135.15-2"; + version = "10.135.21-2"; src = fetchurl { url = "https://download.wavebox.app/stable/linux/deb/amd64/wavebox_${finalAttrs.version}_amd64.deb"; - hash = "sha256-nQWaPDHkwBjV7IUYf+e1NkYzXpnV15XZmqkT/Vz16Gc="; + hash = "sha256-NnJ+pP6JrMiMmoXS/yYm5qMLmv5oyguhmYF/M0Pv4/g="; }; nativeBuildInputs = [ From 1f63458ea4c1369b68ff50f8085e13aa5c345943 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 24 Apr 2025 11:02:09 +0200 Subject: [PATCH 104/165] python313Packages.aiohomekit: 3.2.13 -> 3.2.14 Diff: https://github.com/Jc2k/aiohomekit/compare/refs/tags/3.2.13...refs/tags/3.2.14 Changelog: https://github.com/Jc2k/aiohomekit/releases/tag/3.2.14 --- pkgs/development/python-modules/aiohomekit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 38f7021ce3f0..ea6b2f5b3454 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "3.2.13"; + version = "3.2.14"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = "aiohomekit"; tag = version; - hash = "sha256-J6VxfuLHdxJ92V1puOWv+dnlpBKRBww1iP6IcRMqamk="; + hash = "sha256-TP5YW4pIWO0xHV1EY5hDa80MrBOvkZLyQTNP7m0x+AU="; }; build-system = [ poetry-core ]; From e54984aa25e7df29034e3f4f754950fe807419a7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 24 Apr 2025 11:02:58 +0200 Subject: [PATCH 105/165] python312Packages.mypy-boto3-codebuild: 1.38.0 -> 1.38.1 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index d7c89872f412..108de8f83d2e 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -266,8 +266,8 @@ rec { "sha256-II4WIgBsWK3+CXk/XFzWpmlEXsbBuWt4C3onExl2u0o="; mypy-boto3-codebuild = - buildMypyBoto3Package "codebuild" "1.38.0" - "sha256-MFSvGSyadm+jDU0a+zv5xIHlkhY1KCkfYSkRcbtBVsk="; + buildMypyBoto3Package "codebuild" "1.38.1" + "sha256-ksjuuQGLNtw+9jbc0YieZx9yLBoG/5VYH4Q9ky4zIIw="; mypy-boto3-codecatalyst = buildMypyBoto3Package "codecatalyst" "1.38.0" From 096f10c9e35ce95424276d3a5e958e10796ba90c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 24 Apr 2025 11:03:14 +0200 Subject: [PATCH 106/165] python312Packages.mypy-boto3-ecs: 1.38.0 -> 1.38.1 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 108de8f83d2e..8b98b2f44220 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -462,8 +462,8 @@ rec { "sha256-qJ22ZyzB+8OVRjRklxWYKJlA9WZg542CccUWmdx4p+s="; mypy-boto3-ecs = - buildMypyBoto3Package "ecs" "1.38.0" - "sha256-x1TKXNYuVv7hXpXPkjtdfre6pbfF0Hs3ih30yadVHzY="; + buildMypyBoto3Package "ecs" "1.38.1" + "sha256-YXg0m0bBhNqd3zXkE/yE2Q1VgCF2VdAIuqLff4+39SA="; mypy-boto3-efs = buildMypyBoto3Package "efs" "1.38.0" From ebac5b39404c6175c30bd323dfcaa592f639dd1b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 24 Apr 2025 11:03:24 +0200 Subject: [PATCH 107/165] python312Packages.mypy-boto3-imagebuilder: 1.38.0 -> 1.38.1 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 8b98b2f44220..3f78fbc25130 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -614,8 +614,8 @@ rec { "sha256-n11mu3O2o2sPL13xPtwlWVvpNfVUdV7l7NO2lXg+ZyM="; mypy-boto3-imagebuilder = - buildMypyBoto3Package "imagebuilder" "1.38.0" - "sha256-DIO9k4N3y0WM/Em5io7lPeZ1USFDFPuS9/G/pEsuoGc="; + buildMypyBoto3Package "imagebuilder" "1.38.1" + "sha256-HPu11CEOmUBmaTQz8VXh5cdhgU06VgyFw70Mjy4c9Vs="; mypy-boto3-importexport = buildMypyBoto3Package "importexport" "1.38.0" From 429b649849d15eb532e27918c87c13d0b795419c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 24 Apr 2025 11:03:58 +0200 Subject: [PATCH 108/165] python312Packages.mypy-boto3-resource-explorer-2: 1.38.0 -> 1.38.1 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 3f78fbc25130..fce5b33c7051 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1114,8 +1114,8 @@ rec { "sha256-xJSQ4m36XC98qB7wSgKcjIK4knHvf7pL47xxIiKInsc="; mypy-boto3-resource-explorer-2 = - buildMypyBoto3Package "resource-explorer-2" "1.38.0" - "sha256-4rtUq243gD3EY4073lxxHiyGpvmkVm4d61gvewJuKos="; + buildMypyBoto3Package "resource-explorer-2" "1.38.1" + "sha256-TIahRC+cMQXpduzw6iQmBRXh/l7vDNsLAf0OlxDPSCU="; mypy-boto3-resource-groups = buildMypyBoto3Package "resource-groups" "1.38.0" From 0ff244bf52b737116f32a3be8b5e57e0439723ea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 24 Apr 2025 11:04:21 +0200 Subject: [PATCH 109/165] python313Packages.botocore-stubs: 1.38.0 -> 1.38.1 --- 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 e3d364c61eee..70c43426d92a 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.38.0"; + version = "1.38.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-waWcO0CSVxDtNR8ojN6OkoM7DDngGC5qZSDbL7+7VPo="; + hash = "sha256-4vxGO1mB62a2qAmwhoI4PfEN+utwPMu94fEEJGWawhk="; }; nativeBuildInputs = [ setuptools ]; From 44d600dad98fde8e8124009ca6689b34baa323de Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 24 Apr 2025 11:04:26 +0200 Subject: [PATCH 110/165] python313Packages.boto3-stubs: 1.38.0 -> 1.38.1 --- 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 829104b76992..ac76c4814e8a 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.38.0"; + version = "1.38.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-sEY+y4qWWGCW7eQHvCuUeILYt+o0igSNt2Ivbh4AuTE="; + hash = "sha256-JbA/29oojBV2++AC7PQAiOn11s3wUY3oqEp0Z6qJgJI="; }; build-system = [ setuptools ]; From 4322dfdbac97abd48a4d9f7ad033cd58dbdafb24 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 24 Apr 2025 11:18:28 +0200 Subject: [PATCH 111/165] smbclient-ng: relax rich --- pkgs/by-name/sm/smbclient-ng/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/sm/smbclient-ng/package.nix b/pkgs/by-name/sm/smbclient-ng/package.nix index 75446d790a61..eb79e6f28a16 100644 --- a/pkgs/by-name/sm/smbclient-ng/package.nix +++ b/pkgs/by-name/sm/smbclient-ng/package.nix @@ -19,6 +19,7 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "impacket" "pefile" + "rich" ]; build-system = with python3.pkgs; [ poetry-core ]; @@ -30,6 +31,9 @@ python3.pkgs.buildPythonApplication rec { rich ]; + # Project has no unit tests + doCheck = false; + pythonImportsCheck = [ "smbclientng" ]; meta = { From b3ea80394151ab7ae090991936526a047e9bce80 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 24 Apr 2025 11:21:48 +0200 Subject: [PATCH 112/165] python313Packages.typer-shell: relax rich --- pkgs/development/python-modules/typer-shell/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/typer-shell/default.nix b/pkgs/development/python-modules/typer-shell/default.nix index 61052dcd5eb7..07f3ea5528ec 100644 --- a/pkgs/development/python-modules/typer-shell/default.nix +++ b/pkgs/development/python-modules/typer-shell/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "iterfzf" + "rich" "typer" ]; From 92e9ff932da08d377b130f72391a8e1ec935d5c7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 24 Apr 2025 11:26:32 +0200 Subject: [PATCH 113/165] python313Packages.yara-x: 0.13.0 -> 0.14.0 Diff: https://github.com/VirusTotal/yara-x/compare/refs/tags/v0.13.0...refs/tags/v0.14.0 Changelog: https://github.com/VirusTotal/yara-x/tree/v0.14.0/py --- pkgs/development/python-modules/yara-x/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/yara-x/default.nix b/pkgs/development/python-modules/yara-x/default.nix index efbd33f13584..3e1eae5394ce 100644 --- a/pkgs/development/python-modules/yara-x/default.nix +++ b/pkgs/development/python-modules/yara-x/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { pname = "yara-x"; - version = "0.13.0"; + version = "0.14.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,14 +18,14 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = "yara-x"; tag = "v${version}"; - hash = "sha256-ZSJHvpRZO6Tbw7Ct4oD6QmuV4mJ4RGW5gnT6PTX+nC8="; + hash = "sha256-C8wBGmilouNcNN3HkwvSTWcZY1fe0jVc2TeWDN4w5xA="; }; buildAndTestSubdir = "py"; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname src version; - hash = "sha256-pD4qyw+TTpmcoX1N3C65VelYszYifm9sFOsEkXEysvo="; + hash = "sha256-afCBuWr12trjEIDvE0qnGFxTXU7LKZCzZB8RqgqperY="; }; nativeBuildInputs = [ From b528fe84bd692d9d372aee95c35539bf1ea20b82 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 24 Apr 2025 11:28:16 +0200 Subject: [PATCH 114/165] python313Packages.yaramod: 4.3.0 -> 4.3.1 Diff: https://github.com/avast/yaramod/compare/refs/tags/v4.3.0...refs/tags/v4.3.1 Changelog: https://github.com/avast/yaramod/blob/v4.3.1/CHANGELOG.md --- pkgs/development/python-modules/yaramod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yaramod/default.nix b/pkgs/development/python-modules/yaramod/default.nix index 7012ed6ad906..2e8788fa52c7 100644 --- a/pkgs/development/python-modules/yaramod/default.nix +++ b/pkgs/development/python-modules/yaramod/default.nix @@ -21,14 +21,14 @@ let in buildPythonPackage rec { pname = "yaramod"; - version = "4.3.0"; + version = "4.3.1"; pyproject = true; src = fetchFromGitHub { owner = "avast"; repo = "yaramod"; tag = "v${version}"; - hash = "sha256-cgqVUBSDjT7xuCnSY76v8pAvA3W8tFu0fJZaFAF2caU="; + hash = "sha256-NAKQxKY3FdlSDbDBwiBricvMOwwlhtMNz9RPEaB6NOw="; }; postPatch = '' From 4a7a588e90adf9c931ad7dd717fe9fb6019cd3bc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 24 Apr 2025 11:28:53 +0200 Subject: [PATCH 115/165] python313Packages.tldextract: 5.2.0 -> 5.3.0 Diff: https://github.com/john-kurkowski/tldextract/compare/refs/tags/5.2.0...refs/tags/5.3.0 Changelog: https://github.com/john-kurkowski/tldextract/blob/5.3.0/CHANGELOG.md --- pkgs/development/python-modules/tldextract/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index e9a5d5efd7de..e5c15e65a35e 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "tldextract"; - version = "5.2.0"; + version = "5.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "john-kurkowski"; repo = "tldextract"; tag = version; - hash = "sha256-5/o/9XRIe1BpLJCiTln0C80aT9V9sg308SDtCae6HAE="; + hash = "sha256-PCDjceBU4cjAqRes/yWt/mbM/aWxjYtNl+qN+49OjA8="; }; nativeBuildInputs = [ From 9d972ef4da7b92f12704be7908491da14f6ae2f8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 24 Apr 2025 11:30:12 +0200 Subject: [PATCH 116/165] python313Packages.githubkit: 0.12.10 -> 0.12.11 Diff: https://github.com/yanyongyu/githubkit/compare/refs/tags/v0.12.10...refs/tags/v0.12.11 Changelog: https://github.com/yanyongyu/githubkit/releases/tag/v0.12.11 --- pkgs/development/python-modules/githubkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix index 2e8af7a2d2de..73f8d84fc8d4 100644 --- a/pkgs/development/python-modules/githubkit/default.nix +++ b/pkgs/development/python-modules/githubkit/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "githubkit"; - version = "0.12.10"; + version = "0.12.11"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "yanyongyu"; repo = "githubkit"; tag = "v${version}"; - hash = "sha256-nxJlC3+mHeUApqj1U5Qe3Q937BWD61U9fSXFfg4QNmA="; + hash = "sha256-uCOxLr60ePeEdsWpXKhYwzzZaj8mwiQMWwprNm9i1DE="; }; pythonRelaxDeps = [ "hishel" ]; From c249979afde25dfd420dc36f4e0768b3c7b63910 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 24 Apr 2025 11:42:42 +0200 Subject: [PATCH 117/165] trivy: 0.61.0 -> 0.61.1 Diff: https://github.com/aquasecurity/trivy/compare/refs/tags/v0.61.0...refs/tags/v0.61.1 Changelog: https://github.com/aquasecurity/trivy/releases/tag/v0.61.1 --- pkgs/by-name/tr/trivy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tr/trivy/package.nix b/pkgs/by-name/tr/trivy/package.nix index 00edf3cf211d..d1cba3695ebd 100644 --- a/pkgs/by-name/tr/trivy/package.nix +++ b/pkgs/by-name/tr/trivy/package.nix @@ -11,19 +11,19 @@ buildGo124Module rec { pname = "trivy"; - version = "0.61.0"; + version = "0.61.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "trivy"; tag = "v${version}"; - hash = "sha256-SC/EYozsPdqummWBCrQi852rHk6TAMnzxyn0FzwjJ6w="; + hash = "sha256-T9CjvRmqUAOpDLidYGDyE5L36yPJ3OfZGhvyVuZe5n8="; }; # Hash mismatch on across Linux and Darwin proxyVendor = true; - vendorHash = "sha256-cQPfZnLDNqMfunBr0xa45H/Trh9+EvdDdiYrjZsOyF0="; + vendorHash = "sha256-Qs+E/PtV5hQnfTwBWMkuLTjfWQLAo8ASFHEfFZ9H7AQ="; subPackages = [ "cmd/trivy" ]; From 591d01b474a14d81ec115e969b7836b8416ab348 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 09:57:14 +0000 Subject: [PATCH 118/165] anydesk: 6.4.3 -> 7.0.0 --- pkgs/by-name/an/anydesk/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/an/anydesk/package.nix b/pkgs/by-name/an/anydesk/package.nix index 20db9f9cfd1d..85e0eff56e7a 100644 --- a/pkgs/by-name/an/anydesk/package.nix +++ b/pkgs/by-name/an/anydesk/package.nix @@ -34,14 +34,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "anydesk"; - version = "6.4.3"; + version = "7.0.0"; src = fetchurl { urls = [ "https://download.anydesk.com/linux/anydesk-${finalAttrs.version}-amd64.tar.gz" "https://download.anydesk.com/linux/generic-linux/anydesk-${finalAttrs.version}-amd64.tar.gz" ]; - hash = "sha256-P90BPUayKG+uYszIQkbYcBg1vObQvueq67HU+su+GSI="; + hash = "sha256-AEj4/S4k6mnCb/CagEDhpCtExB8pIqv7V2b/br4nC/8="; }; buildInputs = From 099ca6ffbfdfda6ba93fd3eff9b5c3a25cf90cd2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 24 Apr 2025 12:04:34 +0200 Subject: [PATCH 119/165] python313Packages.getjump: 2.7.2 -> 2.7.3 Changelog: https://github.com/eggplants/getjump/releases/tag/v2.7.3 --- .../python-modules/getjump/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/getjump/default.nix b/pkgs/development/python-modules/getjump/default.nix index 67ab3fa278ad..a5eb1d8948ef 100644 --- a/pkgs/development/python-modules/getjump/default.nix +++ b/pkgs/development/python-modules/getjump/default.nix @@ -4,27 +4,34 @@ buildPythonPackage, fetchPypi, pillow, - poetry-core, + hatchling, pythonOlder, requests, rich, + uv-dynamic-versioning, }: buildPythonPackage rec { pname = "getjump"; - version = "2.7.2"; + version = "2.7.3"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-fP+qFbMQGB9E8nocoNkXgru4mjONSNw2zeBa4CpDbGw="; + hash = "sha256-B0d8a5IcU545zzw+7UzDtm3ACv2hDI4MBOHRPCi1MNQ="; }; - pythonRelaxDeps = [ "pillow" ]; + pythonRelaxDeps = [ + "pillow" + "rich" + ]; - build-system = [ poetry-core ]; + build-system = [ + hatchling + uv-dynamic-versioning + ]; dependencies = [ beautifulsoup4 @@ -41,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Get and save images from jump web viewer"; homepage = "https://github.com/eggplants/getjump"; + changelog = "https://github.com/eggplants/getjump/releases/tag/v${version}"; license = licenses.mit; maintainers = [ ]; mainProgram = "jget"; From a3626756fea2e9815b29fab098a0bb4dc8bcf5c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 10:26:31 +0000 Subject: [PATCH 120/165] puffin: 2.1.3 -> 2.1.5 --- pkgs/by-name/pu/puffin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pu/puffin/package.nix b/pkgs/by-name/pu/puffin/package.nix index 07205ed25b61..93b60c891f06 100644 --- a/pkgs/by-name/pu/puffin/package.nix +++ b/pkgs/by-name/pu/puffin/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "puffin"; - version = "2.1.3"; + version = "2.1.5"; src = fetchFromGitHub { owner = "siddhantac"; repo = pname; rev = "v${version}"; - hash = "sha256-1qF5KOu2Se49Dw8QrSeUYIx9Yf0MCY/nbLu9IFnHxpA="; + hash = "sha256-cXhnCCg5A/G/FKWfCpq130qSD1iTGpgidqzGGnIPqO8="; }; vendorHash = "sha256-ZxAqR3D5VUtbntktrpnywPG3m9rq1utO4fdum0Qe6TU="; From 5a9475bf053a03ffcb12044aca3875bc6debf940 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 24 Apr 2025 12:54:27 +0200 Subject: [PATCH 121/165] cyclonedx-python: 5.3.0 -> 5.5.0 Diff: https://github.com/CycloneDX/cyclonedx-python/compare/refs/tags/v5.3.0...refs/tags/v5.5.0 Changelog: https://github.com/CycloneDX/cyclonedx-python/releases/tag/v5.5.0 --- pkgs/by-name/cy/cyclonedx-python/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cy/cyclonedx-python/package.nix b/pkgs/by-name/cy/cyclonedx-python/package.nix index cea4a5e01c3b..73d0f793fa4e 100644 --- a/pkgs/by-name/cy/cyclonedx-python/package.nix +++ b/pkgs/by-name/cy/cyclonedx-python/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "cyclonedx-python"; - version = "5.3.0"; + version = "5.5.0"; pyproject = true; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-python"; tag = "v${version}"; - hash = "sha256-H3r/ypD3aEkrCnclf+zh0BK4ZzDQBMNvWS7V7xKX43g="; + hash = "sha256-6sWDUuABGDgaim3YSrRNedu5z2XOIY0ERgit78ZM1+E="; }; build-system = with python3Packages; [ poetry-core ]; From b91da0582c0cc2e5458e609c60fddba76b2fc203 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 24 Apr 2025 12:57:26 +0200 Subject: [PATCH 122/165] openmolcas: use cmakeFlagsArray only for options where needed. --- pkgs/by-name/op/openmolcas/package.nix | 33 +++++++++++++------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/op/openmolcas/package.nix b/pkgs/by-name/op/openmolcas/package.nix index 87e27a8a390a..544bd7f6a8cb 100644 --- a/pkgs/by-name/op/openmolcas/package.nix +++ b/pkgs/by-name/op/openmolcas/package.nix @@ -123,24 +123,25 @@ stdenv.mkDerivation rec { passthru = lib.optionalAttrs enableMpi { inherit mpi; }; + cmakeFlags = [ + "-DOPENMP=ON" + "-DTOOLS=ON" + "-DHDF5=ON" + "-DFDE=ON" + "-DEXTERNAL_LIBXC=${lib.getDev libxc}" + (lib.strings.cmakeBool "DMRG" enableQcmaquis) + (lib.strings.cmakeBool "NEVPT2" enableQcmaquis) + "-DCMAKE_SKIP_BUILD_RPATH=ON" + (lib.strings.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic) + (lib.strings.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + "-DLINALG=Manual" + (lib.strings.cmakeBool "DGA" enableMpi) + (lib.strings.cmakeBool "MPI" enableMpi) + ]; + preConfigure = '' - cmakeFlagsArray+=( - "-DOPENMP=ON" - "-DTOOLS=ON" - "-DHDF5=ON" - "-DFDE=ON" - "-DEXTERNAL_LIBXC=${lib.getDev libxc}" - ${lib.strings.cmakeBool "DMRG" enableQcmaquis} - ${lib.strings.cmakeBool "NEVPT2" enableQcmaquis} - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ${lib.strings.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic} - ${lib.strings.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)} - "-DLINALG=Manual" - "-DLINALG_LIBRARIES=-lblas -llapack" - ${lib.strings.cmakeBool "DGA" enableMpi} - ${lib.strings.cmakeBool "MPI" enableMpi} - ) + cmakeFlagsArray+=("-DLINALG_LIBRARIES=-lblas -llapack") '' + lib.optionalString enableMpi '' export GAROOT=${globalarrays}; From ac64c6cf7bb37f089f7eab3ac7080ac77db5402b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 11:21:56 +0000 Subject: [PATCH 123/165] python312Packages.falconpy: 1.4.8 -> 1.4.9 --- pkgs/development/python-modules/falconpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/falconpy/default.nix b/pkgs/development/python-modules/falconpy/default.nix index d949207728e2..c8db462d1b42 100644 --- a/pkgs/development/python-modules/falconpy/default.nix +++ b/pkgs/development/python-modules/falconpy/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "falconpy"; - version = "1.4.8"; + version = "1.4.9"; pyproject = true; src = fetchFromGitHub { owner = "CrowdStrike"; repo = "falconpy"; tag = "v${version}"; - hash = "sha256-tl/+mYilGFGxq9gJcu9tmm6wenF14gIP0gB+HAXQh0o="; + hash = "sha256-P+/AT42aHkWX+4upSh1pul0kf8rFbdHsQLezypa3XyA="; }; build-system = [ hatchling ]; From 1cfd7c7a6dfe0547e5e061db840c095c13a3e62e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 24 Apr 2025 13:45:44 +0200 Subject: [PATCH 124/165] checkov: 3.2.407 -> 3.2.408 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.407...refs/tags/3.2.408 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.408 --- pkgs/by-name/ch/checkov/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index fbfe1c3e8445..75292693a070 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -25,14 +25,14 @@ with py.pkgs; python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.407"; + version = "3.2.408"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-xVscXBrgaJhQDmtuvQ/eQsWS3Z7rpaOJSptWXaMsby0="; + hash = "sha256-QvM45kgRnzmDjYLnO3g1gMYEJpof7W9z/gCPwXExdgc="; }; pythonRelaxDeps = [ From fd748ddb8611ff83b2f0bb387a1cab003efcc507 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 12:00:44 +0000 Subject: [PATCH 125/165] chezmoi: 2.62.1 -> 2.62.2 --- pkgs/by-name/ch/chezmoi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix index b151adce04b4..6b5a6b510034 100644 --- a/pkgs/by-name/ch/chezmoi/package.nix +++ b/pkgs/by-name/ch/chezmoi/package.nix @@ -8,16 +8,16 @@ let argset = { pname = "chezmoi"; - version = "2.62.1"; + version = "2.62.2"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${argset.version}"; - hash = "sha256-2n8ePR5WzV6RtfI9ySIy5Zqg8jKXltUNq572kVUyLWY="; + hash = "sha256-Bma7w/Nhpht02eOVyVJDJq+JDUXR7svD8TdMZhuNw10="; }; - vendorHash = "sha256-7OD/yRI0TD8PM1IoMazN2W5b8AwKs64068ZectGXFtU="; + vendorHash = "sha256-L089chsoaEDo2+ahTKs9w0Np3S2fWVtt9jWRJmBrP3w="; nativeBuildInputs = [ installShellFiles From 7eec42019e7dc4cbc7331f989b46cb0c25bac024 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 12:12:04 +0000 Subject: [PATCH 126/165] proto: 0.47.11 -> 0.48.0 --- pkgs/by-name/pr/proto/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index 295397823535..ce3a229d3039 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "proto"; - version = "0.47.11"; + version = "0.48.0"; src = fetchFromGitHub { owner = "moonrepo"; repo = "proto"; rev = "v${version}"; - hash = "sha256-2Lyd2wa47VhBz4HHHw2qG2RgUlPDWZPvVTIPAknaIVE="; + hash = "sha256-nvcewUlMIfvL/qiBl23cdRfa3IFcCm7ncCSATW4607I="; }; useFetchCargoVendor = true; - cargoHash = "sha256-3zN7t3yplRm4/P0m316uSooDftgJicvWIvz34jzOmBY="; + cargoHash = "sha256-oyATT8lEzBltT6+jXMAHvhPTdXGO4Hm5WwEjy/2bgmE="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration From b9e4c667fd4f3e2a05ef422065707638684a2f26 Mon Sep 17 00:00:00 2001 From: GueLaKais Date: Wed, 23 Apr 2025 21:49:15 +0200 Subject: [PATCH 127/165] gz-utils: init at 3.1.1 --- pkgs/by-name/gz/gz-utils/package.nix | 35 ++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/gz/gz-utils/package.nix diff --git a/pkgs/by-name/gz/gz-utils/package.nix b/pkgs/by-name/gz/gz-utils/package.nix new file mode 100644 index 000000000000..1a4bf09d40a1 --- /dev/null +++ b/pkgs/by-name/gz/gz-utils/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + gz-cmake, + spdlog, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gz-utils"; + version = "3.1.1"; + + src = fetchFromGitHub { + owner = "gazebosim"; + repo = "gz-utils"; + tag = "gz-utils${lib.versions.major finalAttrs.version}_${finalAttrs.version}"; + hash = "sha256-fYzysdB608jfMb/EbqiGD4hXmPxcaVTUrt9Wx0dBlto="; + }; + + nativeBuildInputs = [ + cmake + gz-cmake + spdlog + ]; + + meta = { + description = "General purpose utility classes and functions for the Gazebo libraries"; + homepage = "https://gazebosim.org/home"; + changelog = "https://github.com/gazebosim/gz-utils/blob/${finalAttrs.src.tag}/Changelog.md"; + license = lib.licenses.asl20; + platforms = lib.platforms.unix ++ lib.platforms.windows; + maintainers = with lib.maintainers; [ guelakais ]; + }; +}) From 7b7752f84d497727b1a3cbab7877a51ad087926c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 12:45:49 +0000 Subject: [PATCH 128/165] go-migrate: 4.18.2 -> 4.18.3 --- pkgs/by-name/go/go-migrate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/go-migrate/package.nix b/pkgs/by-name/go/go-migrate/package.nix index f5857b03ad37..1c9ddd5d601a 100644 --- a/pkgs/by-name/go/go-migrate/package.nix +++ b/pkgs/by-name/go/go-migrate/package.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "go-migrate"; - version = "4.18.2"; + version = "4.18.3"; src = fetchFromGitHub { owner = "golang-migrate"; repo = "migrate"; rev = "v${version}"; - sha256 = "sha256-DRWJ5USabSQtNkyDjz8P7eOS2QBE1KaD8K8XYORBVGo="; + sha256 = "sha256-aM8okSrLj2oIb3Ey2KkHu3UQY7mSnPjMfwNsdL2Fz28="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-0SbhHA5gKzODW8rHCEuZXWs8vMsVDMqJsRDPs4V1gGc="; + vendorHash = "sha256-H3FBO6RFoXzwk/9bkSVuIlDbfd4AATzbgLmEvbtahFM="; subPackages = [ "cmd/migrate" ]; From 0b86cb90e36c821a2d12ed176e41cdd107cbdfdf Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Thu, 24 Apr 2025 16:08:50 +0300 Subject: [PATCH 129/165] stats: 2.11.36 -> 2.11.41 Changelog: https://github.com/exelban/stats/releases/tag/v2.11.41 Diff: https://github.com/exelban/stats/compare/v2.11.36...v2.11.41 --- pkgs/by-name/st/stats/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index a1525f25c8c0..e4edb91ac049 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "stats"; - version = "2.11.36"; + version = "2.11.41"; src = fetchurl { url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; - hash = "sha256-ESCZWWJwzkuc+51qSOVj635nADfz2lHRsfn6YQyB69U="; + hash = "sha256-iW22uCyfx9sCX3GyVmYzyJIHylxIpgJLns2oHVFBwc4="; }; sourceRoot = "."; From 1e600fa82b38eaa64aa114e4c50c73518c60bd01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 13:12:44 +0000 Subject: [PATCH 130/165] python312Packages.cohere: 5.14.2 -> 5.15.0 --- pkgs/development/python-modules/cohere/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index af318f156c9c..afd0c794cf8c 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "cohere"; - version = "5.14.2"; + version = "5.15.0"; pyproject = true; src = fetchFromGitHub { owner = "cohere-ai"; repo = "cohere-python"; tag = version; - hash = "sha256-58l6yBJsKDpFktZITbHemLm/PdK9BZOhoxsCJNvyCmQ="; + hash = "sha256-X/6eAST9du6GT3j0d1xZuYfzN5p7rYlgGIIqv7V6vik="; }; build-system = [ poetry-core ]; From 46e9100fc4bd0fa8ce7de4bed1f0e865d1902b29 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 13:14:03 +0000 Subject: [PATCH 131/165] python312Packages.tinytag: 2.1.0 -> 2.1.1 --- pkgs/development/python-modules/tinytag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tinytag/default.nix b/pkgs/development/python-modules/tinytag/default.nix index 1860dcbfc084..8f6d6dfb692f 100644 --- a/pkgs/development/python-modules/tinytag/default.nix +++ b/pkgs/development/python-modules/tinytag/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "tinytag"; - version = "2.1.0"; + version = "2.1.1"; pyproject = true; src = fetchFromGitHub { owner = "tinytag"; repo = "tinytag"; tag = version; - hash = "sha256-QRPnXPTMe0eM9nlZ1YFWJuP+OvifZnaNCwOcJz+48EY="; + hash = "sha256-8+IXbLUevId4zusY6Nv55t/eRkYqGkf1cTZCMYSpuL8="; }; build-system = [ From 0122a43f9542eca01e932592cc1bcb2bc18dc69f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 14:04:23 +0000 Subject: [PATCH 132/165] vnote: 3.19.0 -> 3.19.1 --- pkgs/by-name/vn/vnote/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vn/vnote/package.nix b/pkgs/by-name/vn/vnote/package.nix index de221b81de22..417c30ec0b68 100644 --- a/pkgs/by-name/vn/vnote/package.nix +++ b/pkgs/by-name/vn/vnote/package.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "vnote"; - version = "3.19.0"; + version = "3.19.1"; src = fetchFromGitHub { owner = "vnotex"; repo = "vnote"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-HR7ZxLxFMYaBrBuK7pWGxlCS6WoKITWn8s83fF3Cp/U="; + hash = "sha256-ZRCO32F/J0m7eAp0+AOterYPVJUC3asejzkY6/3QBLg="; }; nativeBuildInputs = [ From 9c92552864be89ad3dc8e7b3059227867e95e140 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 14:27:29 +0000 Subject: [PATCH 133/165] bustools: 0.44.1 -> 0.45.0 --- pkgs/by-name/bu/bustools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bu/bustools/package.nix b/pkgs/by-name/bu/bustools/package.nix index 2ed9fb52bad9..38ae60fa0ab9 100644 --- a/pkgs/by-name/bu/bustools/package.nix +++ b/pkgs/by-name/bu/bustools/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "bustools"; - version = "0.44.1"; + version = "0.45.0"; src = fetchFromGitHub { owner = "BUStools"; repo = "bustools"; rev = "v${version}"; - sha256 = "sha256-0Y+9T9V+l20hqxpKbSWsEB0tt8A/ctYcoPN2n/roxvg="; + sha256 = "sha256-Af2WUryx4HQuAlNJ1RWJK1Mj2M7X+4Ckap3rqEJ3vto="; }; nativeBuildInputs = [ cmake ]; From 42e4eae2b4f137ea38e477687cf3f0f813b787d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 15:04:04 +0000 Subject: [PATCH 134/165] doppler: 3.73.1 -> 3.74.0 --- pkgs/by-name/do/doppler/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/doppler/package.nix b/pkgs/by-name/do/doppler/package.nix index 9b75421ff976..8cfbfa9aeac1 100644 --- a/pkgs/by-name/do/doppler/package.nix +++ b/pkgs/by-name/do/doppler/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.73.1"; + version = "3.74.0"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - hash = "sha256-9UF9ZMQWfhncJkRFieYIawtv0EnfngeS7Sw5uPtyheI="; + hash = "sha256-mT6AB3Xtjm7AHtdF3eKn7dfnd/3ul1nCiZ5e4cHUXbc="; }; vendorHash = "sha256-tSRtgkDPvDlEfwuNhahvs3Pvt4h7QAJrJtb1XQXGaFM="; From 7e3cd6e9b99c7e324e793438872c2fcdd558783d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 15:21:22 +0000 Subject: [PATCH 135/165] pixi: 0.45.0 -> 0.46.0 --- pkgs/by-name/pi/pixi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix index 8dc3db270ec6..d67740eb75f2 100644 --- a/pkgs/by-name/pi/pixi/package.nix +++ b/pkgs/by-name/pi/pixi/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "pixi"; - version = "0.45.0"; + version = "0.46.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "pixi"; tag = "v${finalAttrs.version}"; - hash = "sha256-nOSwGR0V6dOaF5pCmYch6EJN87XCs0atSaWshH6Pwqs="; + hash = "sha256-HkaDc7RauVhuuu4R88xlgiAM9pv6RPgyvaVoPO0PHqA="; }; useFetchCargoVendor = true; - cargoHash = "sha256-vSyo7j+HCWUgXxPAxOGiOGQQwVhHOWJhGyM92KDIeC4="; + cargoHash = "sha256-0X+3/fQLgUSSnDVAociKqk4rJfKHJtKdXIIaSUzI18g="; nativeBuildInputs = [ pkg-config From 836183d9bdca31a00fd21a62d451fefa02e1ee04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 16:10:41 +0000 Subject: [PATCH 136/165] python312Packages.meraki: 2.0.1 -> 2.0.2 --- pkgs/development/python-modules/meraki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meraki/default.nix b/pkgs/development/python-modules/meraki/default.nix index ccf53702e4f1..522b854245f3 100644 --- a/pkgs/development/python-modules/meraki/default.nix +++ b/pkgs/development/python-modules/meraki/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "meraki"; - version = "2.0.1"; + version = "2.0.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "meraki"; repo = "dashboard-api-python"; tag = version; - hash = "sha256-/zRPwPIpKQ56kjBA+zaQefVek51nd+3jlvm5jIz/Ekg="; + hash = "sha256-n2iSnxdjMZvYTG/GWU4NnaoA4+A0JIhHj49j4+T10sU="; }; pythonRelaxDeps = [ From d8e98aec7fab3cb57d3d2c7f93078dd0646fe89a Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 24 Apr 2025 10:51:40 +0300 Subject: [PATCH 137/165] equalx: init at 0.7.1-unstable-2020-02-26 --- pkgs/by-name/eq/equalx/package.nix | 71 ++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 pkgs/by-name/eq/equalx/package.nix diff --git a/pkgs/by-name/eq/equalx/package.nix b/pkgs/by-name/eq/equalx/package.nix new file mode 100644 index 000000000000..8783f6d4e08b --- /dev/null +++ b/pkgs/by-name/eq/equalx/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenv, + fetchFromGitLab, + + # nativeBuildInputs + protobuf, + qt5, + libsForQt5, + pkg-config, + installShellFiles, + + # buildInputs + ghostscript, + poppler-utils, + exempi, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "equalx"; + version = "0.7.1-unstable-2020-02-26"; + + src = fetchFromGitLab { + owner = "q-quark"; + repo = "equalx"; + rev = "b7175a574379d86c43cabbdb6071f0b6d40d8e79"; + hash = "sha256-3KIJk5bTmFjaojjHDurJjEgyvuIf0LHcSi+MrmsRPcg="; + }; + postPatch = '' + substituteInPlace equalx.pro \ + --replace-fail 'git describe --abbrev=0 --tags' 'echo ${finalAttrs.version}' + ''; + + nativeBuildInputs = [ + protobuf + qt5.qmake + qt5.wrapQtAppsHook + pkg-config + installShellFiles + ]; + + buildInputs = [ + qt5.qtbase + qt5.qtmultimedia + libsForQt5.poppler + ghostscript + poppler-utils + exempi + ]; + + installPhase = '' + runHook preInstall + + installBin equalx + installManPage equalx.1 + install -Dm644 equalx.appdata.xml $out/share/metainfo/eqaulx.appdata.xml + install -Dm644 resources/equalx.ico $out/share/icons/hicolor/256x256/apps/equalx.ico + install -Dm644 resources/equalx.desktop $out/share/applications/equalx.desktop + + runHook postInstall + ''; + + meta = { + description = "Graphical interface to latex and a bunch of conversion programs"; + homepage = "https://equalx.sourceforge.io/"; + mainProgram = "equalx"; + downloadPage = "https://gitlab.com/q-quark/equalx"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ doronbehar ]; + }; +}) From d0bc778dab966421f109e60fa0d87af1afeb3e65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 17:26:38 +0000 Subject: [PATCH 138/165] prefect: 3.3.4 -> 3.3.5 --- pkgs/by-name/pr/prefect/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/prefect/package.nix b/pkgs/by-name/pr/prefect/package.nix index 238f2f83d465..239bb1fa8c28 100644 --- a/pkgs/by-name/pr/prefect/package.nix +++ b/pkgs/by-name/pr/prefect/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "prefect"; - version = "3.3.4"; + version = "3.3.5"; pyproject = true; # Trying to install from source is challenging @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { # Source will be missing sdist, uv.lock, ui artefacts ... src = fetchPypi { inherit pname version; - hash = "sha256-ii5AqUeo2asSY3oA2PYqGhRev42KInSrn/plDp4Q90Q="; + hash = "sha256-L5L1ldEpOHJPE9K8UPvpUZlF/85mm5llN912LIlvs9k="; }; pythonRelaxDeps = [ From 27eab49a9e7538ba33dbab889d6860f5b917c6ab Mon Sep 17 00:00:00 2001 From: Stefan Wiehler Date: Sat, 19 Apr 2025 10:56:27 +0200 Subject: [PATCH 139/165] home-assistant-custom-components.benqprojector: init at 0.1.3 --- .../home-automation/home-assistant.nix | 1 + .../benqprojector/package.nix | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/servers/home-assistant/custom-components/benqprojector/package.nix diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index eda79e890193..ad98e75cfbea 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -842,6 +842,7 @@ in # Custom components, maintained manually. "amshan" + "benqprojector" ]; in { diff --git a/pkgs/servers/home-assistant/custom-components/benqprojector/package.nix b/pkgs/servers/home-assistant/custom-components/benqprojector/package.nix new file mode 100644 index 000000000000..2ae968131d14 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/benqprojector/package.nix @@ -0,0 +1,29 @@ +{ + lib, + buildHomeAssistantComponent, + fetchFromGitHub, + benqprojector, +}: + +buildHomeAssistantComponent rec { + owner = "rrooggiieerr"; + domain = "benqprojector"; + version = "0.1.3"; + + src = fetchFromGitHub { + inherit owner; + repo = "homeassistant-benqprojector"; + tag = version; + hash = "sha256-iAFmXL10QqudECsS9u9w7KBETzu9aWCg1EBbFR1ff+o="; + }; + + dependencies = [ benqprojector ]; + + meta = rec { + description = "Home Assistant integration for BenQ projectors"; + homepage = "https://github.com/rrooggiieerr/homeassistant-benqprojector"; + changelog = "${homepage}/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ sephalon ]; + }; +} From 44dd157b6fdd1923e5471e691403ead6d989a608 Mon Sep 17 00:00:00 2001 From: Stefan Wiehler Date: Sat, 19 Apr 2025 15:15:25 +0200 Subject: [PATCH 140/165] nixos/home-assistant: add custom components to used components query There should be no need to add custom components without YAML configuration to extraComponents for systemd service modifications to become effective (e.g. serial access). --- nixos/modules/services/home-automation/home-assistant.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index ad98e75cfbea..2887e5754173 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -20,6 +20,7 @@ let filter filterAttrsRecursive flatten + getAttr hasAttrByPath isAttrs isDerivation @@ -111,7 +112,9 @@ let hasAttrByPath (splitString "." component) cfg.config || useComponentPlatform component || useExplicitComponent component - || builtins.elem component (cfg.extraComponents ++ cfg.defaultIntegrations); + || builtins.elem component ( + cfg.extraComponents ++ cfg.defaultIntegrations ++ map (getAttr "domain") cfg.customComponents + ); # Final list of components passed into the package to include required dependencies extraComponents = filter useComponent availableComponents; From f5e2ecd1196af2795f278d34ff294cf3b87b431b Mon Sep 17 00:00:00 2001 From: Stefan Wiehler Date: Sat, 19 Apr 2025 10:57:51 +0200 Subject: [PATCH 141/165] home-assistant-custom-components.sun2: init at 3.3.5 --- .../custom-components/sun2/package.nix | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 pkgs/servers/home-assistant/custom-components/sun2/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/sun2/package.nix b/pkgs/servers/home-assistant/custom-components/sun2/package.nix new file mode 100644 index 000000000000..b707d666ee26 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/sun2/package.nix @@ -0,0 +1,26 @@ +{ + lib, + buildHomeAssistantComponent, + fetchFromGitHub, +}: + +buildHomeAssistantComponent rec { + owner = "pnbruckner"; + domain = "sun2"; + version = "3.3.5"; + + src = fetchFromGitHub { + inherit owner; + repo = "ha-sun2"; + tag = version; + hash = "sha256-aR9tQw1d64RWuwc9QLhTP0z4TdaKeRfN0p7lMdWUpgw="; + }; + + meta = rec { + description = "Home Assistant Sun2 sensor"; + homepage = "https://github.com/pnbruckner/ha-sun2"; + changelog = "${homepage}/releases/tag/${version}"; + maintainers = with lib.maintainers; [ sephalon ]; + license = lib.licenses.unlicense; + }; +} From dd41ce9d35247c5f99f6df9feb251e9da32d7ca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Dele=C5=84kec?= Date: Thu, 24 Apr 2025 18:34:15 +0100 Subject: [PATCH 142/165] grafana: fix yarn vendor hash --- pkgs/servers/monitoring/grafana/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 0c0bbe5b9aac..20d4eafef941 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -70,7 +70,7 @@ buildGoModule rec { missingHashes = ./missing-hashes.json; offlineCache = yarn-berry_4.fetchYarnBerryDeps { inherit src missingHashes; - hash = "sha256-qJ1xP02tdoZmAlrO5J8wxRYdNeg420NN27Tt2gaNPFc="; + hash = "sha256-tpQjEa4xeD4fmrucynt8WVVXZ3uN5WxjSF8YcjE6HLU="; }; disallowedRequisites = [ offlineCache ]; From d80437f44f92ed26155aebc7951d53e98f77db64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 17:36:27 +0000 Subject: [PATCH 143/165] fabric-ai: 1.4.171 -> 1.4.183 --- pkgs/by-name/fa/fabric-ai/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix index 777a2bffbdb4..9365b2d28df6 100644 --- a/pkgs/by-name/fa/fabric-ai/package.nix +++ b/pkgs/by-name/fa/fabric-ai/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "fabric-ai"; - version = "1.4.171"; + version = "1.4.183"; src = fetchFromGitHub { owner = "danielmiessler"; repo = "fabric"; tag = "v${version}"; - hash = "sha256-NHsgsK7h+PeunGKAgkIOmINPJugkx7nuNvAU4jwsrAI="; + hash = "sha256-40HOm7T8jwNuEdU+vCfg2eQUh72B67fQaHNLzT6QAN0="; }; - vendorHash = "sha256-ax0ZLvLfbmpzO93xRqonHJz1zHs6u0+Mu0WegR1eW60="; + vendorHash = "sha256-ZrIzCKhEa00KOS8tauYEGLR4o7gGVVZ9pdfEQbAGDkI="; # Fabric introduced plugin tests that fail in the nix build sandbox. doCheck = false; From f63e74871f46b4bad723740799298aca7416511c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Haf?= Date: Mon, 7 Apr 2025 12:46:10 +0200 Subject: [PATCH 144/165] bitcoin-knots: 26.1.knots20240325 -> 28.1.knots20250305 --- .../blockchains/bitcoin-knots/default.nix | 15 +++------------ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix index 984ba370893b..e1410eff679d 100644 --- a/pkgs/applications/blockchains/bitcoin-knots/default.nix +++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch2, autoreconfHook, pkg-config, util-linux, @@ -26,21 +25,13 @@ stdenv.mkDerivation rec { pname = if withGui then "bitcoin-knots" else "bitcoind-knots"; - version = "26.1.knots20240325"; + version = "28.1.knots20250305"; src = fetchurl { - url = "https://bitcoinknots.org/files/26.x/${version}/bitcoin-${version}.tar.gz"; - hash = "sha256-PqpePDna2gpCzF2K43N4h6cV5Y9w/e5ZcUvaNEaFaIk="; + url = "https://bitcoinknots.org/files/28.x/${version}/bitcoin-${version}.tar.gz"; + hash = "sha256-DKO3+43Tn/BTKQVrLrCkeMtzm8SfbaJD8rPlb6lDA8A="; }; - patches = [ - # upnp: add compatibility for miniupnpc 2.2.8 - (fetchpatch2 { - url = "https://github.com/bitcoinknots/bitcoin/commit/643014424359a4783cf9c73bee3346ac2f04e713.patch?full_index=1"; - hash = "sha256-FdLoNH3+ZZTbqrwRvhbAeJuGz4SgnIvoWUBzRxjfzs8="; - }) - ]; - nativeBuildInputs = [ autoreconfHook diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index df389f32233d..6e4dd9642809 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17011,6 +17011,11 @@ with pkgs; inherit (darwin) autoSignDarwinBinariesHook; }; + bitcoin-knots = libsForQt5.callPackage ../applications/blockchains/bitcoin-knots { + withGui = true; + inherit (darwin) autoSignDarwinBinariesHook; + }; + bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots { withGui = false; inherit (darwin) autoSignDarwinBinariesHook; From 95c1e7ecfc19db753ce57b992e7408d4fa561b48 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 18:14:48 +0000 Subject: [PATCH 145/165] cwe-client-cli: 0.3.2 -> 0.3.3 --- pkgs/by-name/cw/cwe-client-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cw/cwe-client-cli/package.nix b/pkgs/by-name/cw/cwe-client-cli/package.nix index 19bed845691f..65977be759bf 100644 --- a/pkgs/by-name/cw/cwe-client-cli/package.nix +++ b/pkgs/by-name/cw/cwe-client-cli/package.nix @@ -9,12 +9,12 @@ }: rustPlatform.buildRustPackage rec { pname = "cwe-client-cli"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "NotBalds"; repo = "cwe-client-cli"; rev = "v${version}"; - hash = "sha256-7zzmYwuQ+Sg8hf1zuKtKUMgk0Is1YJB4WdOKdxtWRA0="; + hash = "sha256-3ehzERWV0/hV0Suy9LtCcp+xmaD13Chgu4a0gPT7cHs="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { openssl_3 ]; useFetchCargoVendor = true; - cargoHash = "sha256-ctcsO7HRs3wWcOFW+ewQbKGCSEBlVzT/enAEjFIAaPU="; + cargoHash = "sha256-ml6anuAJru2zVIHNf/z4gdQjplRrXL4FO44cxfaDRns="; meta = { description = "Simple command line client for CWE"; From 7ab53600713848a84f1d3ca19dc1d76b2918682b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 18:26:51 +0000 Subject: [PATCH 146/165] plasmusic-toolbar: 2.3.0 -> 2.4.0 --- pkgs/by-name/pl/plasmusic-toolbar/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plasmusic-toolbar/package.nix b/pkgs/by-name/pl/plasmusic-toolbar/package.nix index 1de7bdefae6b..994ec48113e2 100644 --- a/pkgs/by-name/pl/plasmusic-toolbar/package.nix +++ b/pkgs/by-name/pl/plasmusic-toolbar/package.nix @@ -7,13 +7,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "plasmusic-toolbar"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "ccatterina"; repo = "plasmusic-toolbar"; tag = "v${finalAttrs.version}"; - hash = "sha256-YxhZ4XhHCbEPVrc+qqO+phGnEf0nnKiDVRB5K4wjR/Q="; + hash = "sha256-bf7dFLQD3JQZtB3GH0aMK9U2D+bOv9mF8NbxUn7oOlQ="; }; installPhase = '' From 628ad49e82295a1b54b897a10b78c22570d9e358 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 18:27:31 +0000 Subject: [PATCH 147/165] python312Packages.osc-sdk-python: 0.31.0 -> 0.33.0 --- pkgs/development/python-modules/osc-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/osc-sdk-python/default.nix b/pkgs/development/python-modules/osc-sdk-python/default.nix index 3ed07bdbb471..d268d9f0765b 100644 --- a/pkgs/development/python-modules/osc-sdk-python/default.nix +++ b/pkgs/development/python-modules/osc-sdk-python/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "osc-sdk-python"; - version = "0.31.0"; + version = "0.33.0"; pyproject = true; src = fetchFromGitHub { owner = "outscale"; repo = "osc-sdk-python"; tag = "v${version}"; - hash = "sha256-5Ws/yPIw0H+FV9oRZLsywap1eqIkCOEK1yGhk0Ft6Ic="; + hash = "sha256-+UDbll+svNlCyY+/tSqfDa9rceFTavOUGQc//Vl2+Fk="; fetchSubmodules = true; }; From 3594ed47e2005c632fac39c389151d88d274c678 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 24 Apr 2025 20:28:01 +0200 Subject: [PATCH 148/165] python312Packages.hf-xet: 1.0.3 -> 1.0.4 Diff: https://github.com/huggingface/xet-core/compare/refs/tags/v1.0.3...refs/tags/v1.0.4 Changelog: https://github.com/huggingface/xet-core/releases/tag/v1.0.4 --- pkgs/development/python-modules/hf-xet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/hf-xet/default.nix b/pkgs/development/python-modules/hf-xet/default.nix index 4b27b84b125d..ceb5bb874e83 100644 --- a/pkgs/development/python-modules/hf-xet/default.nix +++ b/pkgs/development/python-modules/hf-xet/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "hf-xet"; - version = "1.0.3"; + version = "1.0.4"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "xet-core"; tag = "v${version}"; - hash = "sha256-ZbLSPLRsRVSF9HD+R8k/GR7yq3Ej+c+AyYbyHhKOf3w="; + hash = "sha256-V1PeTgjVrJ4FquP/LkKnd8N41mca4zNPDP3M+dPbTyA="; }; sourceRoot = "${src.name}/hf_xet"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src sourceRoot ; - hash = "sha256-gO5A457CJUdV7nfy69yliL6uqMu5Fc3rY2uXyMM/Na0="; + hash = "sha256-gDHBnNWpCHwxbwYKQZQEfClXUPtWesb+cxtPXEOj1Us="; }; nativeBuildInputs = [ From 759e1028ead7811a0c1e4b58fd89602638dcce57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 18:50:13 +0000 Subject: [PATCH 149/165] tpnote: 1.25.7 -> 1.25.8 --- pkgs/by-name/tp/tpnote/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix index 0a46eeb6575e..40a7ebdc2ab0 100644 --- a/pkgs/by-name/tp/tpnote/package.nix +++ b/pkgs/by-name/tp/tpnote/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "tpnote"; - version = "1.25.7"; + version = "1.25.8"; src = fetchFromGitHub { owner = "getreu"; repo = "tp-note"; tag = "v${version}"; - hash = "sha256-lTUS3sAMq5FPxC8Moi6a+S71XtG+9AlBTO/cDVTrncM="; + hash = "sha256-zJgV6iy/guLhsyg9TDy8rkM+hyjpO9GSN2oEuVkBbV0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-3oallbuiRrBDAWsIl8vGz3xbjPIb5ceBmQsNHVOWbTE="; + cargoHash = "sha256-LdHS1XWstAqij6xe5+KSHvMRtS2/Gw3UE+VjkogAfTs="; nativeBuildInputs = [ cmake From 014338e53adfec9aa14ce950a066e9c64bed07b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 19:05:30 +0000 Subject: [PATCH 150/165] pulumi-esc: 0.13.0 -> 0.13.1 --- pkgs/by-name/pu/pulumi-esc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pu/pulumi-esc/package.nix b/pkgs/by-name/pu/pulumi-esc/package.nix index 08dd1f41862b..d4b79c60b403 100644 --- a/pkgs/by-name/pu/pulumi-esc/package.nix +++ b/pkgs/by-name/pu/pulumi-esc/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "pulumi-esc"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "pulumi"; repo = "esc"; rev = "v${version}"; - hash = "sha256-hQYA8j0fmVdlRuUfZy4NT5oYYot2lHrTqFCPe255F2k="; + hash = "sha256-EmlZLtlioBbXX71TiqZF9bH2VxLT6u4X7CQQsV0ioeY="; }; subPackages = "cmd/esc"; - vendorHash = "sha256-J4ozpVm177DR+a35ckMtLY/4rFIPU6MsI5ewXz/wYGc="; + vendorHash = "sha256-v2+fisMMNUZVcDbUhXDGAUU6rC+Clrh/rb3cuuSCLF0="; ldflags = [ "-s" From 5ac04acb1a281c05b6919b15caa9b8226c1b06de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 19:29:27 +0000 Subject: [PATCH 151/165] qownnotes: 25.4.3 -> 25.4.4 --- pkgs/by-name/qo/qownnotes/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix index 347bc8aa5295..6f244f6d5040 100644 --- a/pkgs/by-name/qo/qownnotes/package.nix +++ b/pkgs/by-name/qo/qownnotes/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "qownnotes"; appname = "QOwnNotes"; - version = "25.4.3"; + version = "25.4.4"; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz"; - hash = "sha256-BjtRrRRV7Rs4PTa7DZ3+fFfpx7sH7xtvsf1ALUUvjd0="; + hash = "sha256-9xRituPXmGQ1fFHp4JvXkQ9Rvoj535UP53G6vDMl1L4="; }; nativeBuildInputs = From 75f756da0fe895dce9498960f218449ce5e33ec6 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Thu, 24 Apr 2025 21:42:37 +0200 Subject: [PATCH 152/165] repro-env: init at 0.4.3 --- pkgs/by-name/re/repro-env/package.nix | 36 +++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/re/repro-env/package.nix diff --git a/pkgs/by-name/re/repro-env/package.nix b/pkgs/by-name/re/repro-env/package.nix new file mode 100644 index 000000000000..56d319a77326 --- /dev/null +++ b/pkgs/by-name/re/repro-env/package.nix @@ -0,0 +1,36 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "repro-env"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "kpcyrd"; + repo = "repro-env"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ViOUS7prwLl2C2BOlwqshFks+q+xeiAD4ONdKUcDgWU="; + }; + + cargoHash = "sha256-0ljIt84CqcdC01YXU6J7RlvkN/nlU6Thige8TricFus="; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + meta = { + changelog = "https://github.com/kpcyrd/repro-env/releases/tag/v${finalAttrs.version}"; + description = "Dependency lockfiles for reproducible build environments"; + homepage = "https://github.com/kpcyrd/repro-env"; + license = with lib.licenses; [ + asl20 + mit + ]; + maintainers = with lib.maintainers; [ drupol ]; + mainProgram = "repro-env"; + }; +}) From 8bf2436c01dfb024e5ba3cf62e9990caa7773baf Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Thu, 24 Apr 2025 16:44:27 -0400 Subject: [PATCH 153/165] doc/python: clarify `optional-dependencies' are only for explicit dep groups (#377049) Some project may claim, in their README or otherwise, a particular library as an optional dependency. But it doesn't make it one in the context of the `optional-dependencies` derivation attribute. --- doc/languages-frameworks/python.section.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 6594254a0387..13f12e1521b1 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -2102,6 +2102,14 @@ Note this method is preferred over adding parameters to builders, as that can result in packages depending on different variants and thereby causing collisions. +::: {.note} +The `optional-dependencies` attribute should only be used for dependency groups +as defined in package metadata. If a package gracefully handles missing +dependencies in runtime but doesn't advertise it through package metadata, then +these dependencies should not be listed at all. (One may still have to list +them in `nativeCheckInputs` to pass test suite.) +::: + ### How to contribute a Python package to nixpkgs? {#tools} Packages inside nixpkgs must use the [`buildPythonPackage`](#buildpythonpackage-function) or [`buildPythonApplication`](#buildpythonapplication-function) function directly, From 5cdfa43792d8f94dba0061bddcc541aaaf8f0e37 Mon Sep 17 00:00:00 2001 From: sephalon Date: Thu, 24 Apr 2025 22:50:34 +0200 Subject: [PATCH 154/165] home-assistant-custom-components: drop skipping of build phase (#401539) Commit 86fff9e3bf8f ("buildHomeAssistantComponent: make build quieter") globally turns the build phase into NOP for custom component packages. --- .../home-assistant/custom-components/climate_group/package.nix | 2 -- .../home-assistant/custom-components/emporia_vue/package.nix | 2 -- .../home-assistant/custom-components/epex_spot/package.nix | 1 - .../home-assistant/custom-components/frigate/package.nix | 2 -- .../home-assistant/custom-components/govee-lan/package.nix | 2 -- .../servers/home-assistant/custom-components/miele/package.nix | 3 --- .../home-assistant/custom-components/moonraker/package.nix | 1 - .../home-assistant/custom-components/nest_protect/package.nix | 2 -- .../custom-components/prometheus_sensor/package.nix | 2 -- .../home-assistant/custom-components/smartir/package.nix | 2 -- .../custom-components/xiaomi_gateway3/package.nix | 2 -- .../home-assistant/custom-components/xiaomi_miot/package.nix | 2 -- 12 files changed, 23 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/climate_group/package.nix b/pkgs/servers/home-assistant/custom-components/climate_group/package.nix index b57ddb13f21d..c80c8aa79b00 100644 --- a/pkgs/servers/home-assistant/custom-components/climate_group/package.nix +++ b/pkgs/servers/home-assistant/custom-components/climate_group/package.nix @@ -15,8 +15,6 @@ buildHomeAssistantComponent rec { hash = "sha256-f/VQUNzRSxmKGNgijaafQ5NbngUUKmcdkafYC3Ol9qM="; }; - dontBuild = true; - meta = { changelog = "https://github.com/bjrnptrsn/climate_group/blob/${src.rev}/README.md#changelog"; description = "Group multiple climate devices to a single entity"; diff --git a/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix index f87b9576fb40..80004f862251 100644 --- a/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix +++ b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix @@ -25,8 +25,6 @@ buildHomeAssistantComponent rec { "pyemvue" ]; - dontBuild = true; - meta = with lib; { description = "Reads data from the Emporia Vue energy monitor into Home Assistant"; homepage = "https://github.com/magico13/ha-emporia-vue"; diff --git a/pkgs/servers/home-assistant/custom-components/epex_spot/package.nix b/pkgs/servers/home-assistant/custom-components/epex_spot/package.nix index 0a4ecf45a161..1743cbdd8be8 100644 --- a/pkgs/servers/home-assistant/custom-components/epex_spot/package.nix +++ b/pkgs/servers/home-assistant/custom-components/epex_spot/package.nix @@ -24,7 +24,6 @@ buildHomeAssistantComponent rec { #skip phases without activity dontConfigure = true; doCheck = false; - dontBuild = true; meta = with lib; { changelog = "https://github.com/mampfes/ha_epex_spot/releases/tag/${version}"; diff --git a/pkgs/servers/home-assistant/custom-components/frigate/package.nix b/pkgs/servers/home-assistant/custom-components/frigate/package.nix index ddd69f9f4df7..da3a78d9d1ed 100644 --- a/pkgs/servers/home-assistant/custom-components/frigate/package.nix +++ b/pkgs/servers/home-assistant/custom-components/frigate/package.nix @@ -29,8 +29,6 @@ buildHomeAssistantComponent rec { dependencies = [ hass-web-proxy-lib ]; - dontBuild = true; - nativeCheckInputs = [ homeassistant diff --git a/pkgs/servers/home-assistant/custom-components/govee-lan/package.nix b/pkgs/servers/home-assistant/custom-components/govee-lan/package.nix index abe5ba099588..3e3c4c816158 100644 --- a/pkgs/servers/home-assistant/custom-components/govee-lan/package.nix +++ b/pkgs/servers/home-assistant/custom-components/govee-lan/package.nix @@ -28,8 +28,6 @@ buildHomeAssistantComponent { }) ]; - dontBuild = true; - dependencies = [ govee-led-wez ]; diff --git a/pkgs/servers/home-assistant/custom-components/miele/package.nix b/pkgs/servers/home-assistant/custom-components/miele/package.nix index 884ff9a34b10..7732aad2891f 100644 --- a/pkgs/servers/home-assistant/custom-components/miele/package.nix +++ b/pkgs/servers/home-assistant/custom-components/miele/package.nix @@ -23,9 +23,6 @@ buildHomeAssistantComponent rec { pymiele ]; - # Makefile only used for bumping the version - dontBuild = true; - meta = with lib; { changelog = "https://github.com/astrandb/miele/releases/tag/v${version}"; description = "Modern integration for Miele devices in Home Assistant"; diff --git a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix index ec21ff0f6b57..5d14a0ed2f2b 100644 --- a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix +++ b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix @@ -23,7 +23,6 @@ buildHomeAssistantComponent rec { #skip phases with nothing to do dontConfigure = true; - dontBuild = true; doCheck = false; meta = with lib; { diff --git a/pkgs/servers/home-assistant/custom-components/nest_protect/package.nix b/pkgs/servers/home-assistant/custom-components/nest_protect/package.nix index 6bfe72a4d91d..3de4be8a639b 100644 --- a/pkgs/servers/home-assistant/custom-components/nest_protect/package.nix +++ b/pkgs/servers/home-assistant/custom-components/nest_protect/package.nix @@ -15,8 +15,6 @@ buildHomeAssistantComponent rec { hash = "sha256-UAVyfI+cHYx0va2P14moyy6BbhNegsdLWtiex5QeFrs="; }; - dontBuild = true; - # AttributeError: 'async_generator' object has no attribute 'data' doCheck = false; diff --git a/pkgs/servers/home-assistant/custom-components/prometheus_sensor/package.nix b/pkgs/servers/home-assistant/custom-components/prometheus_sensor/package.nix index b92f43f4a5da..ea72242000a7 100644 --- a/pkgs/servers/home-assistant/custom-components/prometheus_sensor/package.nix +++ b/pkgs/servers/home-assistant/custom-components/prometheus_sensor/package.nix @@ -16,8 +16,6 @@ buildHomeAssistantComponent rec { hash = "sha256-+28mMvzNKVInknnDh++YolXR+/b1wsve1VEn4olR7Fs="; }; - dontBuild = true; - meta = with lib; { changelog = "https://github.com/mweinelt/ha-prometheus-sensor/blob/${version}/CHANGELOG.md"; description = "Import prometheus query results into Home Assistant"; diff --git a/pkgs/servers/home-assistant/custom-components/smartir/package.nix b/pkgs/servers/home-assistant/custom-components/smartir/package.nix index dcbe0491b049..c0ca2b5ed1a0 100644 --- a/pkgs/servers/home-assistant/custom-components/smartir/package.nix +++ b/pkgs/servers/home-assistant/custom-components/smartir/package.nix @@ -24,8 +24,6 @@ buildHomeAssistantComponent rec { distutils ]; - dontBuild = true; - postInstall = '' cp -r codes $out/custom_components/smartir/ ''; diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix index 081590df249b..7c39fd05c5ed 100644 --- a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix +++ b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix @@ -20,8 +20,6 @@ buildHomeAssistantComponent rec { dependencies = [ zigpy ]; - dontBuild = true; - passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix index a251d82fd730..99f3845722b5 100644 --- a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix +++ b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix @@ -26,8 +26,6 @@ buildHomeAssistantComponent rec { python-miio ]; - dontBuild = true; - passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=^v([0-9.]+)$" ]; }; meta = { From 14d9a488663ee09d85ed5b1004103470cc8d22e9 Mon Sep 17 00:00:00 2001 From: emaryn Date: Fri, 25 Apr 2025 04:57:52 +0800 Subject: [PATCH 155/165] codecov-cli: 9.1.1 -> 10.4.0 --- pkgs/by-name/co/codecov-cli/package.nix | 27 ++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/co/codecov-cli/package.nix b/pkgs/by-name/co/codecov-cli/package.nix index 63f7a7ce0457..3fe49668b9e9 100644 --- a/pkgs/by-name/co/codecov-cli/package.nix +++ b/pkgs/by-name/co/codecov-cli/package.nix @@ -1,22 +1,29 @@ { - fetchPypi, lib, python3Packages, + fetchFromGitHub, }: python3Packages.buildPythonApplication rec { pname = "codecov-cli"; - version = "9.1.1"; + version = "10.4.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-jaljYA2x2nZUOn9vy/CdtxfGjQKHtrtY13WmBdsICTA="; - }; + src = + (fetchFromGitHub { + owner = "codecov"; + repo = "codecov-cli"; + tag = "v${version}"; + hash = "sha256-R1GFQ81N/e2OX01oSs8Xs+PM0JKVZofiUPADVdxCzWk="; + fetchSubmodules = true; + }).overrideAttrs + (_: { + GIT_CONFIG_COUNT = 1; + GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf"; + GIT_CONFIG_VALUE_0 = "git@github.com:"; + }); - build-system = with python3Packages; [ - setuptools - ]; + build-system = with python3Packages; [ setuptools ]; pythonRelaxDeps = [ "httpx" @@ -33,6 +40,8 @@ python3Packages.buildPythonApplication rec { responses test-results-parser tree-sitter + sentry-sdk + wrapt ]; meta = { From 132e8bcc5dc353cdd5abe521a9e7bd2ffdb02cf7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 21:18:49 +0000 Subject: [PATCH 156/165] affine: 0.21.2 -> 0.21.4 --- pkgs/by-name/af/affine/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index b54ab0dce852..2bf2698ea3b7 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -43,17 +43,17 @@ in stdenv.mkDerivation (finalAttrs: { pname = binName; - version = "0.21.2"; + version = "0.21.4"; src = fetchFromGitHub { owner = "toeverything"; repo = "AFFiNE"; tag = "v${finalAttrs.version}"; - hash = "sha256-d5dHHiiCXhzn8qJlCqJVw0qC86PvKyDZstPivX9bpCI="; + hash = "sha256-Xd8b+JXL46r9Jv5Uv5wdtvSKwnHafEo52v1aERmyxrI="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-0vhUeqCStM7P8+sDs3ZI+JlEzPAreoP+1X8x5zKOJUo="; + hash = "sha256-1BTSvHaSPE55v6awnvRry1Exms+zeGug3PNldZ2v2HY="; }; yarnOfflineCache = stdenvNoCC.mkDerivation { name = "yarn-offline-cache"; @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { ''; dontInstall = true; outputHashMode = "recursive"; - outputHash = "sha256-pJiMCyBJSuTaxix3kKnSCrURL2+t26zB4Y59gGdxalo="; + outputHash = "sha256-w9Lz8wFq34VXInoE5pUeg1B7N92D+TnBWbL2qJ/q8ik="; }; buildInputs = lib.optionals hostPlatform.isDarwin [ From 4f25858e08f79cb9563bd91cc8355a87bf321c6a Mon Sep 17 00:00:00 2001 From: Aidan Gauland Date: Fri, 25 Apr 2025 09:22:44 +1200 Subject: [PATCH 157/165] heroic: simplify code to make node-gyp run offline Co-authored-by: TomaSajt <62384384+TomaSajt@users.noreply.github.com> --- pkgs/by-name/he/heroic-unwrapped/package.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/by-name/he/heroic-unwrapped/package.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix index c92d68d57353..f51612b4fbcc 100644 --- a/pkgs/by-name/he/heroic-unwrapped/package.nix +++ b/pkgs/by-name/he/heroic-unwrapped/package.nix @@ -53,11 +53,7 @@ stdenv.mkDerivation (finalAttrs: { runHook preBuild # set nodedir to prevent node-gyp from downloading headers - # taken from https://nixos.org/manual/nixpkgs/stable/#javascript-tool-specific - mkdir -p $HOME/.node-gyp/${nodejs.version} - echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion - ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version} - export npm_config_nodedir=${nodejs} + export npm_config_nodedir=${electron.headers} pnpm --offline electron-vite build pnpm --offline electron-builder \ From a0a5d1272d60076dd6169a4f8b96ff53373f03bc Mon Sep 17 00:00:00 2001 From: George Shammas Date: Fri, 18 Apr 2025 18:36:29 -0400 Subject: [PATCH 158/165] phpExtensions.luasandbox: init at 4.1.2 --- .../php-packages/luasandbox/default.nix | 30 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/php-packages/luasandbox/default.nix diff --git a/pkgs/development/php-packages/luasandbox/default.nix b/pkgs/development/php-packages/luasandbox/default.nix new file mode 100644 index 000000000000..e15101c474d7 --- /dev/null +++ b/pkgs/development/php-packages/luasandbox/default.nix @@ -0,0 +1,30 @@ +{ + lib, + buildPecl, + fetchFromGitHub, + pkg-config, + lua51Packages, +}: + +buildPecl rec { + pname = "luasandbox"; + version = "4.1.2"; + + src = fetchFromGitHub { + owner = "wikimedia"; + repo = "mediawiki-php-luasandbox"; + tag = version; + hash = "sha256-HWObytoHBvxF9+QC62yJfi6MuHOOXFbSNkhuz5zWPCY="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ lua51Packages.lua ]; + + meta = { + description = "extension for PHP 7 and PHP 8 to allow safely running untrusted Lua 5.1 code from within PHP"; + license = lib.licenses.mit; + homepage = "https://www.mediawiki.org/wiki/LuaSandbox"; + maintainers = with lib.maintainers; [ georgyo ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index ea7031d03df8..8f2751660bdb 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -312,6 +312,8 @@ lib.makeScope pkgs.newScope ( ioncube-loader = callPackage ../development/php-packages/ioncube-loader { }; + luasandbox = callPackage ../development/php-packages/luasandbox { }; + mailparse = callPackage ../development/php-packages/mailparse { }; maxminddb = callPackage ../development/php-packages/maxminddb { }; From f39dae8935e2d4436f448a1f97e0ab8035916690 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Apr 2025 01:03:10 +0000 Subject: [PATCH 159/165] codeberg-cli: 0.4.9 -> 0.4.11 --- pkgs/by-name/co/codeberg-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix index c95d906d22c9..30e5ad35d558 100644 --- a/pkgs/by-name/co/codeberg-cli/package.nix +++ b/pkgs/by-name/co/codeberg-cli/package.nix @@ -10,18 +10,18 @@ }: rustPlatform.buildRustPackage rec { pname = "codeberg-cli"; - version = "0.4.9"; + version = "0.4.11"; src = fetchFromGitea { domain = "codeberg.org"; owner = "Aviac"; repo = "codeberg-cli"; rev = "v${version}"; - hash = "sha256-uifLgXwKcdZ8Q2GjVIa/EA5iq+T9pm821aKsXPbPL34="; + hash = "sha256-wf9Ve7focNBo6fGsjBQpTIx+DtxOo73AIQ9uoV8Q88Q="; }; useFetchCargoVendor = true; - cargoHash = "sha256-nKI0bIKocTjodZ6O1VTTTrlzeeueaH6crF9jdTnx5lI="; + cargoHash = "sha256-LmLMTnNwxih5HcrMUmQpVdIVz4KeHxcOFtOrNqgGPkA="; nativeBuildInputs = [ pkg-config installShellFiles From e406066f94d2cb4a17d708f99bcb892ec2934e12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Apr 2025 01:42:30 +0000 Subject: [PATCH 160/165] opentofu: 1.9.0 -> 1.9.1 --- pkgs/by-name/op/opentofu/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/opentofu/package.nix b/pkgs/by-name/op/opentofu/package.nix index e73a6e6b27f0..6c7c2792d443 100644 --- a/pkgs/by-name/op/opentofu/package.nix +++ b/pkgs/by-name/op/opentofu/package.nix @@ -15,16 +15,16 @@ let package = buildGoModule rec { pname = "opentofu"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu"; tag = "v${version}"; - hash = "sha256-e0ZzbQdex0DD7Bj9WpcVI5roh0cMbJuNr5nsSVaOSu4="; + hash = "sha256-YZMv17fnvzgzm35MXFkvMc5JAuPnyapa41H8Ob4t88c="; }; - vendorHash = "sha256-fMTbLSeW+pw6GK8/JLZzG2ER90ss2g1FSDX5+f292do="; + vendorHash = "sha256-avfyMwYv8nKLCUHSExsPvYQrt9sMKZNPHFB/YFGQs2s="; ldflags = [ "-s" "-w" From a28e53d2f50b5950bff28c75e008a6a60bd86224 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Apr 2025 03:00:57 +0000 Subject: [PATCH 161/165] upbound-main: 0.39.0-0.rc.0.319.gfbb14165 -> 0.39.0-0.rc.0.375.gfed05a63 --- pkgs/by-name/up/upbound/sources-main.json | 34 +++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/up/upbound/sources-main.json b/pkgs/by-name/up/upbound/sources-main.json index 5385dad36920..b98695abea8a 100644 --- a/pkgs/by-name/up/upbound/sources-main.json +++ b/pkgs/by-name/up/upbound/sources-main.json @@ -8,38 +8,38 @@ "fetchurlAttrSet": { "docker-credential-up": { "aarch64-darwin": { - "hash": "sha256-/izZizyqsBJMYELKhU8KOXUeOv9l+gbmidq0EnBHpbY=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.319.gfbb14165/bundle/docker-credential-up/darwin_arm64.tar.gz" + "hash": "sha256-xvRrhG3+uAwR1hfc5Ltf98CTdY6gYVA9YRA1BnLOgXw=", + "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.375.gfed05a63/bundle/docker-credential-up/darwin_arm64.tar.gz" }, "aarch64-linux": { - "hash": "sha256-kc5d9hdKHWd8oys0x/+RBNvB5xHMCBB+YRTOQWw26PQ=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.319.gfbb14165/bundle/docker-credential-up/linux_arm64.tar.gz" + "hash": "sha256-rtzPdlbmgWdE6PihMMmRyz8x/AFklBqgPBO2Bm7o/GA=", + "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.375.gfed05a63/bundle/docker-credential-up/linux_arm64.tar.gz" }, "x86_64-darwin": { - "hash": "sha256-7XRb35x5r9bqkJc4Hi9YbAAF7tK2tdyxTiYD0PQuwsY=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.319.gfbb14165/bundle/docker-credential-up/darwin_amd64.tar.gz" + "hash": "sha256-QMyaGIZwPGUGlID7HMe7zh2Ium3d8P1vXRFDkaQgXIQ=", + "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.375.gfed05a63/bundle/docker-credential-up/darwin_amd64.tar.gz" }, "x86_64-linux": { - "hash": "sha256-peGrumeN6iD2Yl5RgBOdLdpkoiA2JMyGe1Z/OkmiogY=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.319.gfbb14165/bundle/docker-credential-up/linux_amd64.tar.gz" + "hash": "sha256-/Cq70JhxYp+q9/p3jw93O9rYrmYQi4p0CAf3Q22FARk=", + "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.375.gfed05a63/bundle/docker-credential-up/linux_amd64.tar.gz" } }, "up": { "aarch64-darwin": { - "hash": "sha256-VtuDCMA6C2oRcIGMFkWkftsOe9SwTNk7FXxFQfpA5sk=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.319.gfbb14165/bundle/up/darwin_arm64.tar.gz" + "hash": "sha256-P+p0lZzlOx08xoh3faMt0dh00e+VX7JeXrj98T1jWkk=", + "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.375.gfed05a63/bundle/up/darwin_arm64.tar.gz" }, "aarch64-linux": { - "hash": "sha256-5mrDsZUXiGzWK8I5P2fQZi3iNLGSy0OCxz8GdJH9wyU=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.319.gfbb14165/bundle/up/linux_arm64.tar.gz" + "hash": "sha256-Wa1esP+v0sL62T91LUld+xMxv/5O89rnivY7c1aXqvU=", + "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.375.gfed05a63/bundle/up/linux_arm64.tar.gz" }, "x86_64-darwin": { - "hash": "sha256-EmD2YruVppeXMhbX9EVTr800MMHj36CtS/QVC3AasPk=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.319.gfbb14165/bundle/up/darwin_amd64.tar.gz" + "hash": "sha256-ZZX6hgy4XV6FDuXdmeRKlyMvSYk+3/T020wgCaX9mkw=", + "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.375.gfed05a63/bundle/up/darwin_amd64.tar.gz" }, "x86_64-linux": { - "hash": "sha256-EFfe70yKImxLqkWjMgjXEhoBbDu+kVJMy+Ladpxg2BU=", - "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.319.gfbb14165/bundle/up/linux_amd64.tar.gz" + "hash": "sha256-lBqnKwjBfLImptezjqdD2iamx2D5lgBmPTLeeI77hdA=", + "url": "https://cli.upbound.io/main/v0.39.0-0.rc.0.375.gfed05a63/bundle/up/linux_amd64.tar.gz" } } }, @@ -49,5 +49,5 @@ "x86_64-darwin", "x86_64-linux" ], - "version": "0.39.0-0.rc.0.319.gfbb14165" + "version": "0.39.0-0.rc.0.375.gfed05a63" } From 45cc1db6d64ac6397d4c9e2fead0de6d95688025 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 21:28:25 +0000 Subject: [PATCH 162/165] google-chrome: 135.0.7049.84 -> 135.0.7049.114 --- pkgs/by-name/go/google-chrome/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 0df3d9391e3e..4fcb674e635d 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -171,11 +171,11 @@ let linux = stdenv.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "135.0.7049.84"; + version = "135.0.7049.114"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-ZygM2YuML23KPJQ8Kl5f2YqI+0vbXnC3fYk8l8R/nXk="; + hash = "sha256-1YdXtlEY6icyPMngvfthLdhSaMGbpI0lifFkZSZc2a4="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -274,11 +274,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "135.0.7049.85"; + version = "135.0.7049.115"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/adtorua7m5iaphuubpwxkpgb7qwa_135.0.7049.85/GoogleChrome-135.0.7049.85.dmg"; - hash = "sha256-NvCVflxCbMyx4wnbg+3IlO01xZuvzKAVPgg/S629Xls="; + url = "http://dl.google.com/release2/chrome/ba5pqpswpjr5iyzekrawihvjey_135.0.7049.115/GoogleChrome-135.0.7049.115.dmg"; + hash = "sha256-0J1qJ8i141RsmDGGcMM4UvVlT9tBtyn3cOFTz1XIxSk="; }; dontPatch = true; From 0b571a1e32f810ee5168e0cf533e7606d0f8f072 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 24 Apr 2025 22:22:11 +0000 Subject: [PATCH 163/165] altus: 5.7.0 -> 5.7.1 --- pkgs/by-name/al/altus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/altus/package.nix b/pkgs/by-name/al/altus/package.nix index f91eff143376..51fc6edee604 100644 --- a/pkgs/by-name/al/altus/package.nix +++ b/pkgs/by-name/al/altus/package.nix @@ -7,12 +7,12 @@ let pname = "altus"; - version = "5.7.0"; + version = "5.7.1"; src = fetchurl { name = "altus-${version}.AppImage"; url = "https://github.com/amanharwara/altus/releases/download/${version}/Altus-${version}.AppImage"; - hash = "sha256-75mNEXH+C/gRptq3Cx2GUdm3+goDbIvHzpYl0tU3WoU="; + hash = "sha256-G0jKBnobMKJWZmLtyYLpdruNxEVGt5rZHPFJYJkY8Y4="; }; appimageContents = appimageTools.extractType2 { From ac88b73a8bf2621a593cd7dac1a9a525833e919b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Apr 2025 03:31:15 +0000 Subject: [PATCH 164/165] linkerd_edge: 25.4.2 -> 25.4.4 --- pkgs/applications/networking/cluster/linkerd/edge.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 4ae752d29272..71fd07d969a1 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "25.4.2"; - sha256 = "0i0z2x9x2sf9lpkvw9pnvwp74hxm9rqbdhx9v91qwlsnw8clc950"; - vendorHash = "sha256-jIL/08mSvz6xLlB1Iyj2F9vnfOkadeYf92CeXXx0Otw="; + version = "25.4.4"; + sha256 = "1zdi6ziz8ys231xszzildi1rk0pz15cp27xf7zpy6hl0n2b1vbij"; + vendorHash = "sha256-xr/RMfVYYXtfWpnPmm3tG/TwJITIyRRFzoZwbBQwSc8="; } From 21212687c55a332b071fc008b9a9910768d38ecf Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 25 Apr 2025 07:48:10 +0200 Subject: [PATCH 165/165] nvitop: 1.4.2 -> 1.5.0 Diff: https://github.com/XuehaiPan/nvitop/compare/refs/tags/v1.4.2...refs/tags/v1.5.0 Changelog: https://github.com/XuehaiPan/nvitop/releases/tag/v1.5.0 --- pkgs/by-name/nv/nvitop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nv/nvitop/package.nix b/pkgs/by-name/nv/nvitop/package.nix index 0d4d75998593..9436ba6386b7 100644 --- a/pkgs/by-name/nv/nvitop/package.nix +++ b/pkgs/by-name/nv/nvitop/package.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "nvitop"; - version = "1.4.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "XuehaiPan"; repo = "nvitop"; tag = "v${version}"; - hash = "sha256-2l/VfqgV2UmMVad3UYASjYFu/Mzp2K2XNQFUDq1XM9k="; + hash = "sha256-1WL1S6jUbCLtuAe223AAmCcOcLZ0rStE04uCd0L9gVw="; }; pythonRelaxDeps = [ "nvidia-ml-py" ];