From 930d2462cd285d95c2f57679e0f5a7e44ce71baf Mon Sep 17 00:00:00 2001 From: Gereon Schomber Date: Sat, 9 Sep 2023 10:43:00 +0200 Subject: [PATCH 01/70] optipng: Use libpng instead of libpng-1.2 --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d397f7c3da64..b6ba86286244 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11669,9 +11669,7 @@ with pkgs; optifine = optifinePackages.optifine-latest; - optipng = callPackage ../tools/graphics/optipng { - libpng = libpng12; - }; + optipng = callPackage ../tools/graphics/optipng { }; olsrd = callPackage ../tools/networking/olsrd { }; From c44396d6d43f87999836e3fbbc14c3188759269e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Sep 2023 00:27:02 +0000 Subject: [PATCH 02/70] mergerfs: 2.36.0 -> 2.37.0 --- pkgs/tools/filesystems/mergerfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index 47afb4b2d623..b48db16b8fdf 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mergerfs"; - version = "2.36.0"; + version = "2.37.0"; src = fetchFromGitHub { owner = "trapexit"; repo = pname; rev = version; - sha256 = "sha256-oGgL3uMKMs66GTgWtMMX0M9ARXiJnV3l3Tnja373sCo="; + sha256 = "sha256-IJcTzEKFMSAryG44Rpwgl0toxFxNyyJyaVC8MO1Dv7M="; }; nativeBuildInputs = [ From 456ce8dc34adae6c43d80286827fdad8249388b8 Mon Sep 17 00:00:00 2001 From: run <91027295+tnxz@users.noreply.github.com> Date: Mon, 11 Sep 2023 09:07:32 +0530 Subject: [PATCH 03/70] jetbrains: fix darwin errors on macOS 13 As the jetbrains products have notarized binaries no further post processing is required more about this can be found in https://github.com/NixOS/nixpkgs/commit/3ea22dab7d906f400cc5983874dbadeb8127c662 --- pkgs/applications/editors/jetbrains/darwin.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/jetbrains/darwin.nix b/pkgs/applications/editors/jetbrains/darwin.nix index e5c4dd7e4fc9..bd14cf2ffdad 100644 --- a/pkgs/applications/editors/jetbrains/darwin.nix +++ b/pkgs/applications/editors/jetbrains/darwin.nix @@ -22,6 +22,7 @@ stdenvNoCC.mkDerivation { inherit pname meta src version plugins; passthru.buildNumber = buildNumber; desktopName = product; + dontFixup = true; installPhase = '' runHook preInstall APP_DIR="$out/Applications/${product}.app" From 43555b34363a372a0ac2051808d7c70f0599bf99 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Wed, 13 Sep 2023 23:22:07 +0800 Subject: [PATCH 04/70] mfoc-hardnested: unstable-2021-08-14 -> unstable-2023-03-27 - Migrate to by-name hierarchy - Use the finalAttrs pattern for easier overrides - Fix build on aarch64-darwin --- pkgs/by-name/mf/mfoc-hardnested/package.nix | 38 +++++++++++++++++++ .../security/mfoc-hardnested/default.nix | 25 ------------ pkgs/top-level/all-packages.nix | 2 - 3 files changed, 38 insertions(+), 27 deletions(-) create mode 100644 pkgs/by-name/mf/mfoc-hardnested/package.nix delete mode 100644 pkgs/tools/security/mfoc-hardnested/default.nix diff --git a/pkgs/by-name/mf/mfoc-hardnested/package.nix b/pkgs/by-name/mf/mfoc-hardnested/package.nix new file mode 100644 index 000000000000..550d3a5c4667 --- /dev/null +++ b/pkgs/by-name/mf/mfoc-hardnested/package.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, libnfc +, xz +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mfoc-hardnested"; + version = "unstable-2023-03-27"; + + src = fetchFromGitHub { + owner = "nfc-tools"; + repo = finalAttrs.pname; + rev = "a6007437405a0f18642a4bbca2eeba67c623d736"; + hash = "sha256-YcUMS4wx5ML4yYiARyfm7T7nLomgG9YCSFj+ZUg5XZk="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + libnfc + xz + ]; + + meta = with lib; { + description = "A fork of mfoc integrating hardnested code from the proxmark"; + license = licenses.gpl2; + homepage = "https://github.com/nfc-tools/mfoc-hardnested"; + maintainers = with maintainers; [ azuwis ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/tools/security/mfoc-hardnested/default.nix b/pkgs/tools/security/mfoc-hardnested/default.nix deleted file mode 100644 index ee6d5a3dd30f..000000000000 --- a/pkgs/tools/security/mfoc-hardnested/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libnfc, xz }: - -stdenv.mkDerivation rec { - pname = "mfoc-hardnested"; - version = "unstable-2021-08-14"; - - src = fetchFromGitHub { - owner = "nfc-tools"; - repo = pname; - rev = "2c25bf05a0b13827b9d06382c5d384b2e5c88238"; - hash = "sha256-fhfevQCw0E5TorHx61Vltpmv7DAjgH73i27O7aBKxz4="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libnfc xz ]; - - meta = with lib; { - description = "A fork of mfoc integrating hardnested code from the proxmark"; - license = licenses.gpl2; - homepage = "https://github.com/nfc-tools/mfoc-hardnested"; - maintainers = with maintainers; [ azuwis ]; - platforms = platforms.unix; - broken = (stdenv.isDarwin && stdenv.isAarch64); # Undefined symbols "_memalign" referenced - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2cc291e0cd63..3294f4d399aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10793,8 +10793,6 @@ with pkgs; mfoc = callPackage ../tools/security/mfoc { }; - mfoc-hardnested = callPackage ../tools/security/mfoc-hardnested { }; - microbin = callPackage ../servers/microbin { }; microdnf = callPackage ../tools/package-management/microdnf { }; From 3da98e6c45caadcce0f451b081a1862b2d49c50a Mon Sep 17 00:00:00 2001 From: Bela Stoyan Date: Thu, 14 Sep 2023 12:13:18 +0200 Subject: [PATCH 05/70] pferd: 3.4.3 -> 3.5.0 --- pkgs/tools/misc/pferd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pferd/default.nix b/pkgs/tools/misc/pferd/default.nix index caaa69416270..46b525cd578b 100644 --- a/pkgs/tools/misc/pferd/default.nix +++ b/pkgs/tools/misc/pferd/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "pferd"; - version = "3.4.3"; + version = "3.5.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Garmelon"; repo = "PFERD"; rev = "refs/tags/v${version}"; - sha256 = "sha256-m9u4CLvyF2n61JQyxEKlVzWZCUhzVEVqpSZMNDZXCAo="; + sha256 = "sha256-iGMqKRM/8pnnew/U1r7Od9Giyn9z4BxVGO85nw3FI9Y="; }; nativeBuildInputs = with python3Packages; [ From b4a0a97c5c358fc5ccb3014417e033bc2fc84e57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 14 Sep 2023 18:17:10 +0200 Subject: [PATCH 06/70] ArchiSteamFarm: 5.4.8.3 -> 5.4.9.3 --- .../applications/misc/ArchiSteamFarm/default.nix | 4 ++-- pkgs/applications/misc/ArchiSteamFarm/deps.nix | 16 ++++++++-------- .../misc/ArchiSteamFarm/web-ui/default.nix | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 5d335a5325d1..60b835c719b5 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "5.4.8.3"; + version = "5.4.9.3"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-ySiN5iPs+EtgzPJJpKvD7BR3Z2xa4HLnTEtqroW478w="; + hash = "sha256-Yp8hnMIeV+ZHY6yISJdFd1yAQipQsU5vcXgxFDvkGnA="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index 3b621fe971be..5d353bfdf6b8 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -57,11 +57,11 @@ (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.2.0"; sha256 = "0nx7nrzbg9gk9skdc9x330cbr5xbsly6z9gzxm46vywf55yp8vaj"; }) - (fetchNuGet { pname = "Markdig.Signed"; version = "0.31.0"; sha256 = "1amf0yp5fqdkrr2r6nscpw1h1r3gghhxbczk6j255smdhhy0dzv9"; }) + (fetchNuGet { pname = "Markdig.Signed"; version = "0.32.0"; sha256 = "0rc1d8pwypq44pr15wn8g52zbqz70swdrdmjlzccf6zvwy1vyqkc"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "7.0.0"; sha256 = "1f13vsfs1rp9bmdp3khk4mk2fif932d72yxm2wszpsr239x4s2bf"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "7.0.0"; sha256 = "1w49rg0n5wb1m5wnays2mmym7qy7bsi2b1zxz97af2rkbw3s3hbd"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.3"; sha256 = "1xxzd2yxlbq2h4k6flp7lvffmmwrjlyha2z1yvrxxymiyyggk2zg"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.7.0"; sha256 = "12m9fay2d7jvj00hfpws37vflpqvz4dy4gcm25bjycg1zyfpzvly"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) @@ -71,11 +71,11 @@ (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.6.3"; sha256 = "1f2b9ljc3l6lk2qq3ps6pzb5r4dvqvs9j1xav8kj2yy52i2dbz7r"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.7.0"; sha256 = "1srhqqmnf9pxdbpffr7dh0bihhf09d0iq5g6gh8ql7brfrh99lvb"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.6.3"; sha256 = "0czzs36ybgipn9bga2swkdd653vh0wvs5hsi2lgykhblimdmb947"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.6.3"; sha256 = "0yi0n8jxf4l6v8bscgi8ws9zf5i84213pf1qj5d7nwx4jb05m23l"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.7.0"; sha256 = "1sqmk99644fx66zk2qa2ims1zl6741i3wl4rjh4z6jakd4xbc28i"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.7.0"; sha256 = "1s8ap0ljqssbqp1ilgsidjr948b9szf1cbl3fgl6smxig9im4zrl"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.1.1"; sha256 = "0y3ic8jv5jhld6gan2qfa2wyk4z57f7y4y5a47njr0jvxxnarg2c"; }) (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.1.1"; sha256 = "1lbgkrbrkmw4c54g61cwbmwc4zl8hyqmp283ymvj93lq7chbxasn"; }) @@ -86,9 +86,9 @@ (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) - (fetchNuGet { pname = "NLog"; version = "5.2.2"; sha256 = "1r3r2sm97lirfd4sb8vhshl8iy9pg006glrgagapxhrh5kapn44g"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.2"; sha256 = "1ixfyx1pg5j7id6kr3blxpbffmzhw9944ha1k6bp8l41rzcny4z8"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.2"; sha256 = "0251bi5fwqx1vvndw604lsgmhaq1sn74kfmpn5i3nr2j7rs5lyax"; }) + (fetchNuGet { pname = "NLog"; version = "5.2.3"; sha256 = "0srai3s2kk9y2jimdvw1xw86nch38q6nza598dpr81dghx3s6j6w"; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.3"; sha256 = "0j19fljxbcc0bysmj7i0fmiax6sp5kjapf2llkimv7dh63rj9ckg"; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.3"; sha256 = "0rhha2lwrzwlx0q1a8w9ph9xwayl3kmmy200ygsghcd02srlazkj"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) (fetchNuGet { pname = "protobuf-net"; version = "3.2.16"; sha256 = "0pwlqlq2p8my2sr8b0cvdav5cm8wpwf3s4gy7s1ba701ac2zyb9y"; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.16"; sha256 = "00znhikq7valr3jaxg66cwli9hf75wkmmpf6rf8p790hf8lxq0c5"; }) diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 6c0e749b2085..77f4e9c6e299 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -9,11 +9,11 @@ buildNpmPackage { repo = "ASF-ui"; # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version - rev = "578e8eacf9eb0367d864ed741017dce23415c1be"; - hash = "sha256-It76gyrTPiZFEj9aSFKwAsj2jhV3zacJS8CNl4sr7OU="; + rev = "0b812a7ab0d2f01a675d27f80008ad7b6972b4aa"; + hash = "sha256-ut0x/qT3DyDASW4QbNT+BF6eXHCIbTol5E+3+tirFDA="; }; - npmDepsHash = "sha256-7404OPGhF7bgdvtyfLM/7zRXGUWPr2RLUCzeaHcCj0A="; + npmDepsHash = "sha256-HpBEoAIGejpHJnUciz4iWILcXdgpw7X1xFuXmx9Z9dw="; installPhase = '' runHook preInstall From 026179d746616902c891795d12c205e9223dceb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 14 Sep 2023 18:40:44 +0200 Subject: [PATCH 07/70] vtm: 0.9.9t -> 0.9.9u Diff: https://github.com/netxs-group/vtm/compare/v0.9.9t...v0.9.9u --- pkgs/tools/misc/vtm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index 331b880aa86d..bd4941afe5bf 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vtm"; - version = "0.9.9t"; + version = "0.9.9u"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${version}"; - sha256 = "sha256-WbigrJohLYCRvgsCNd4Cid1zGaP1aQbj59QhZ6ymLms="; + sha256 = "sha256-ySelsabe5J3Wne8L/F01R/CMPibUR18ZKWH2s25t+KY="; }; nativeBuildInputs = [ cmake ]; From dbeadd986e9ab56640dd1d7453b0b09fdc8e3586 Mon Sep 17 00:00:00 2001 From: nat Date: Wed, 13 Sep 2023 15:15:50 +0200 Subject: [PATCH 08/70] lunar-client: 3.0.7 -> 3.0.10 --- pkgs/games/lunar-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/lunar-client/default.nix b/pkgs/games/lunar-client/default.nix index bc1919270848..599edb1acffd 100644 --- a/pkgs/games/lunar-client/default.nix +++ b/pkgs/games/lunar-client/default.nix @@ -5,11 +5,11 @@ let pname = "lunar-client"; - version = "3.0.7"; + version = "3.0.10"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; - hash = "sha256-JpgKxCFXO+oK9D7gpk6AfiZLWzgFlijVWKhvfkBrJwY="; + hash = "sha256-mbEV+iciL4+PtfvStyXZXK5Zb91N9H1VJ5amZj+2EyA="; }; appimageContents = appimageTools.extract { inherit pname version src; }; From 2288921c10881f74b817c6e3db8016bcded8ce65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 15 Sep 2023 22:27:54 +0200 Subject: [PATCH 09/70] dnscontrol: 4.3.0 -> 4.4.0 Diff: https://github.com/StackExchange/dnscontrol/compare/v4.3.0...v4.4.0 Changelog: https://github.com/StackExchange/dnscontrol/releases/tag/v4.4.0 --- pkgs/applications/networking/dnscontrol/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 4b9b37925910..a00717801aba 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-poLRt/T7BGzcIBjBcm943XnSurO3DJOx2QyqjDcqNRo="; + sha256 = "sha256-OxZH8dUl7PEzcan9Jl1rwPpP0+pj4jzLydEQfxxWM+o="; }; - vendorHash = "sha256-3xT5WPBcEclXad8zBA+T7/M6fDmfMWljV8NuxvtvTsA="; + vendorHash = "sha256-3aGdn6Gp+N/a+o9dl4h0oIOnYhtu4oZuBF6X/HKjQOI="; subPackages = [ "." ]; From 1f10ced26aa1a8c9ed2ae8f2242a524ed8dd8655 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Sep 2023 21:15:10 +0000 Subject: [PATCH 10/70] dnf5: 5.1.1 -> 5.1.3 --- pkgs/tools/package-management/dnf5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/dnf5/default.nix b/pkgs/tools/package-management/dnf5/default.nix index d8cda93b6cad..1234ddd76d30 100644 --- a/pkgs/tools/package-management/dnf5/default.nix +++ b/pkgs/tools/package-management/dnf5/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dnf5"; - version = "5.1.1"; + version = "5.1.3"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = "dnf5"; rev = finalAttrs.version; - hash = "sha256-mO+l2TgVPyA5dQeS6GsjXVDTQlhQYq/wWkDE5ZCd86Q="; + hash = "sha256-Z1Pbi3dGqAQeVaagpOUsjYsT46DAlcFHsDhQzyeCCfY="; }; nativeBuildInputs = [ cmake createrepo_c gettext help2man pkg-config ]; From bccdedaac12a80285270fb4bce81776553a24277 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Fri, 15 Sep 2023 23:26:59 +0200 Subject: [PATCH 11/70] azure-functions-core-tools: 4.0.5095 -> 4.0.5348 Also remove unused dependencies --- .../tools/azure-functions-core-tools/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/azure-functions-core-tools/default.nix b/pkgs/development/tools/azure-functions-core-tools/default.nix index 1f3db24b477c..1d1f13b8b655 100644 --- a/pkgs/development/tools/azure-functions-core-tools/default.nix +++ b/pkgs/development/tools/azure-functions-core-tools/default.nix @@ -10,22 +10,20 @@ curl, zlib, libuuid, - dotnetbuildhelpers, - dotnetCorePackages, openssl, }: let platforms = { "aarch64-darwin" = { platformStr = "osx-arm64"; - hash = "sha512-Jpj/jmDoc01f1LqcdtszZHOG87jy7p3INajhN0taVzVX6l7WnrxY9Y8VLffBffWuNJ9LZjpGVDLt4/JqyALWrw=="; + hash = "sha256-yp3VTt5m8KuACjrBIotfQ5ZdgMvfwYIFaqY2475pHRs="; }; "x86_64-darwin" = { platformStr = "osx-x64"; - hash = "sha512-mHOEnSxcA3x2LK3rhte5eMP97mf0q8BkbS54gGFGz91ufigWmTRrSlGVr3An/1iLlA5/k+AHJU4olWbL2Qlr0A=="; + hash = "sha256-bTHh0mwGbe6JVsR8rDHGpGJ2+AipHb8NIBIW7iiuz6I="; }; "x86_64-linux" = { platformStr = "linux-x64"; - hash = "sha512-d2Ym8kofv/ik4m94D0gz3LcOQxWIDaGmXTmv4XX2zYztH/4wXC2JRr8vIpqwwX86gy3apUmTc3rCyc5Zrz2Sig=="; + hash = "sha256-5R4/hCxCz6KfBl9Zbei+iFty5S2MOYt9hMvPMjCzL54="; }; }; @@ -33,7 +31,7 @@ in stdenv.mkDerivation rec { pname = "azure-functions-core-tools"; - version = "4.0.5095"; + version = "4.0.5348"; src = fetchurl { url = "https://github.com/Azure/${pname}/releases/download/${version}/Azure.Functions.Cli.${platformInfo.platformStr}.${version}.zip"; @@ -43,12 +41,10 @@ in nativeBuildInputs = [ unzip makeWrapper - dotnetbuildhelpers icu libunwind curl zlib - dotnetCorePackages.sdk_6_0 ]; libPath = lib.makeLibraryPath [ From a791332eb58719c156f90ab2b4eabc6f34b4a86b Mon Sep 17 00:00:00 2001 From: mdarocha Date: Fri, 15 Sep 2023 23:37:40 +0200 Subject: [PATCH 12/70] azure-functions-core-tools: add myself as maintainer --- pkgs/development/tools/azure-functions-core-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/azure-functions-core-tools/default.nix b/pkgs/development/tools/azure-functions-core-tools/default.nix index 1d1f13b8b655..e187dbf6b393 100644 --- a/pkgs/development/tools/azure-functions-core-tools/default.nix +++ b/pkgs/development/tools/azure-functions-core-tools/default.nix @@ -88,7 +88,7 @@ in binaryNativeCode ]; license = licenses.mit; - maintainers = with maintainers; []; + maintainers = with maintainers; [ mdarocha ]; platforms = ["x86_64-linux" "aarch64-darwin" "x86_64-darwin"]; }; } From 59c5ffcf9f6f938dc2581194b99a367b3e1cc736 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Sep 2023 00:17:23 +0000 Subject: [PATCH 13/70] vectorscan: 5.4.9 -> 5.4.10.1 --- pkgs/development/libraries/vectorscan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vectorscan/default.nix b/pkgs/development/libraries/vectorscan/default.nix index 03aec03ad656..9913eff323bc 100644 --- a/pkgs/development/libraries/vectorscan/default.nix +++ b/pkgs/development/libraries/vectorscan/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "vectorscan"; - version = "5.4.9"; + version = "5.4.10.1"; src = fetchFromGitHub { owner = "VectorCamp"; repo = "vectorscan"; rev = "vectorscan/${version}"; - hash = "sha256-V5Qgr8aH1H+ZoJ0IZ52HIDRZq+yIwHjLf3gU/ZhjjlY="; + hash = "sha256-x6FefOrUvpN/A4GXTd+3SGZEAQL6pXt83ufxRIY3Q9k="; }; nativeBuildInputs = [ From 195132361d725e8677b4cf3150bb62fd88fcfbd1 Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Sat, 16 Sep 2023 19:25:59 +0530 Subject: [PATCH 14/70] kvmtool: add mfrw as maintainer Signed-off-by: Muhammad Falak R Wani --- pkgs/applications/virtualization/kvmtool/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/kvmtool/default.nix b/pkgs/applications/virtualization/kvmtool/default.nix index e3b52c411d6b..2dcc6905ea7b 100644 --- a/pkgs/applications/virtualization/kvmtool/default.nix +++ b/pkgs/applications/virtualization/kvmtool/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { description = "A lightweight tool for hosting KVM guests"; homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git/tree/README"; license = licenses.gpl2Only; - maintainers = with maintainers; [ astro ]; + maintainers = with maintainers; [ astro mfrw ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; mainProgram = "nvramtool"; }; From ab63498ff6e39a8ed926cadece8e2491aa9ba1c7 Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Sat, 16 Sep 2023 19:24:21 +0530 Subject: [PATCH 15/70] kvmtool: unstable-2023-04-06 -> unstable-2023-07-12 Signed-off-by: Muhammad Falak R Wani --- pkgs/applications/virtualization/kvmtool/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/kvmtool/default.nix b/pkgs/applications/virtualization/kvmtool/default.nix index 2dcc6905ea7b..111ed207a3eb 100644 --- a/pkgs/applications/virtualization/kvmtool/default.nix +++ b/pkgs/applications/virtualization/kvmtool/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "kvmtool"; - version = "unstable-2023-04-06"; + version = "unstable-2023-07-12"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/will/kvmtool.git"; - rev = "77b108c6a6f1c66fb7f60a80d17596bb80bda8ad"; - sha256 = "sha256-wPhqjVpc6I9UOdb6lmzGh797sdvJ5q4dap2ssg8OY5E="; + rev = "106e2ea7756d980454d68631b87d5e25ba4e4881"; + sha256 = "sha256-wpc5DfHnui0lBVH4uOq6a7pXVUZStjNLRvauu6QpRvE="; }; buildInputs = lib.optionals stdenv.hostPlatform.isAarch64 [ dtc ]; From c06e06f34344ba7d8c2029ee036c94f2930fdf76 Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Sat, 16 Sep 2023 19:29:33 +0530 Subject: [PATCH 16/70] kvmtool: fix mainProgram as lkvm instead of nvramtool Signed-off-by: Muhammad Falak R Wani --- pkgs/applications/virtualization/kvmtool/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/kvmtool/default.nix b/pkgs/applications/virtualization/kvmtool/default.nix index 111ed207a3eb..e7429f3312da 100644 --- a/pkgs/applications/virtualization/kvmtool/default.nix +++ b/pkgs/applications/virtualization/kvmtool/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation { license = licenses.gpl2Only; maintainers = with maintainers; [ astro mfrw ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; - mainProgram = "nvramtool"; + mainProgram = "lkvm"; }; } From 0f9f87d1bfa395cb5ce1f374e3d7a83c7ff17f42 Mon Sep 17 00:00:00 2001 From: toastal Date: Sat, 16 Sep 2023 22:34:55 +0700 Subject: [PATCH 17/70] =?UTF-8?q?lunarml:=20unstable-2023-08-25=20?= =?UTF-8?q?=E2=86=92=20unstable-2023-09-16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/lunarml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/lunarml/default.nix b/pkgs/development/compilers/lunarml/default.nix index 5d0b952aa36d..d520328443b1 100644 --- a/pkgs/development/compilers/lunarml/default.nix +++ b/pkgs/development/compilers/lunarml/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation { pname = "lunarml"; - version = "unstable-2023-08-25"; + version = "unstable-2023-09-16"; src = fetchFromGitHub { owner = "minoki"; repo = "LunarML"; - rev = "69d09b47601f4041ca7e8a513c75f3e4835af9dd"; - sha256 = "sha256-GXUcWI4/akOKIvCHrsOfceZEdyNZdIdalTc6wX+svS4="; + rev = "0fe97ebed71d6aa24c9e80436d45af1b3ef6abd3"; + sha256 = "KSLQva4Lv+hZWrx2cMbLOj82ldodiGn/9j8ksB1FN+s="; }; outputs = [ "out" "doc" ]; From c8b64f21ba7611ba123507cdd73735bd024df793 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 16 Sep 2023 18:54:05 +0200 Subject: [PATCH 18/70] mautrix-whatsapp: 0.10.0 -> 0.10.1 https://github.com/mautrix/whatsapp/releases/tag/v0.10.1 --- pkgs/servers/mautrix-whatsapp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 3f3de2dc2f16..1a0845e8752d 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-NbIDVBfh/6NXEvQhypOC5ToOq0EEkKKiMMahGJdXX0g="; + hash = "sha256-I1qM1hq6bnBgbtfzgWvySairfr+Q6TthMIQM+Mregc8="; }; buildInputs = [ olm ]; - vendorHash = "sha256-5S5uq7CRixw6PvtE4xz+AWfS+VsKE4+JVZjfyXmvbsM="; + vendorHash = "sha256-TH353K6BOTzFC/iPIf1S7rV0DSIxjJEg42ru5H8NbSE="; doCheck = false; From 5fd7abad640815d43217c6e409879e2fa3208856 Mon Sep 17 00:00:00 2001 From: ahirner Date: Sun, 17 Sep 2023 08:12:52 +0200 Subject: [PATCH 19/70] dioxus-cli: 0.4.0 -> 0.4.1 * update src * use testers.testVersion --- .../tools/rust/dioxus-cli/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/rust/dioxus-cli/default.nix b/pkgs/development/tools/rust/dioxus-cli/default.nix index fbe1a6a3b730..c4ea4ff20c07 100644 --- a/pkgs/development/tools/rust/dioxus-cli/default.nix +++ b/pkgs/development/tools/rust/dioxus-cli/default.nix @@ -6,18 +6,20 @@ , cacert , openssl , darwin +, testers +, dioxus-cli }: rustPlatform.buildRustPackage rec { pname = "dioxus-cli"; - version = "0.4.0"; + version = "0.4.1"; src = fetchCrate { inherit pname version; - hash = "sha256-4BIuD/rrA398hPEoNt5PwWylPAR0fA1UKc90xyH5Fd0="; + hash = "sha256-h2l6SHty06nLNbdlnSzH7I4XY53yyxNbx663cHYmPG0="; }; - cargoHash = "sha256-ok+fjvwz4k0/M5j7wut2A2AK6tuO3UfZtgoCXaCaHXY="; + cargoHash = "sha256-3pFkEC1GAJmTqXAymX4WRIq7EEtY17u1TCg+OhqL3bA="; nativeBuildInputs = [ pkg-config cacert ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ @@ -32,10 +34,11 @@ rustPlatform.buildRustPackage rec { "--skip=server::web::proxy::test::add_proxy_trailing_slash" ]; - doInstallCheck = true; - installCheckPhase = '' - $out/bin/dx --version | grep "dioxus ${version}" - ''; + passthru.tests.version = testers.testVersion { + package = dioxus-cli; + command = "${meta.mainProgram} --version"; + inherit version; + }; meta = with lib; { homepage = "https://dioxuslabs.com"; From 4203926036517984734bae99d4c34399e1fa731b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Sep 2023 06:25:04 +0000 Subject: [PATCH 20/70] kubectl-gadget: 0.19.0 -> 0.20.0 --- .../networking/cluster/kubectl-gadget/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix index 8ba0d50dd362..0403f5d64319 100644 --- a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-gadget"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "inspektor-gadget"; repo = "inspektor-gadget"; rev = "v${version}"; - hash = "sha256-5FbjD02HsMChaMMvTjsB/hzivO4s1H5tLK1QMIMlBCI="; + hash = "sha256-cwzxjK278xMqXwMQLhRhXWR2HhCKYOBMAiM4Y1B7Etk="; }; - vendorHash = "sha256-Beas+oXcK5i4ibE5EAa9+avYuax/kr3op1xbtMPJMas="; + vendorHash = "sha256-lBOZe74SWMv+z3quIx8NEK6lqygiQAbiU4AvzuXcOKg="; CGO_ENABLED = 0; From 66a2e4a395631ae3e390470e19876c0742b6d7e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Sep 2023 09:19:40 +0000 Subject: [PATCH 21/70] yyjson: 0.7.0 -> 0.8.0 --- pkgs/development/libraries/yyjson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/yyjson/default.nix b/pkgs/development/libraries/yyjson/default.nix index 48b10368aee5..7fe163362864 100644 --- a/pkgs/development/libraries/yyjson/default.nix +++ b/pkgs/development/libraries/yyjson/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "yyjson"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "ibireme"; repo = "yyjson"; rev = finalAttrs.version; - hash = "sha256-Cz8K+cWuDpoMY6d+ecuOvXIMc4wtx15LLvxpFibkNyw="; + hash = "sha256-uAh/AUUDudQr+1+3YLkg9KxARgvKWxfDZlqo8388nFY="; }; nativeBuildInputs = [ From 3a44cbc914bc16aa18694a426349aa22a89eef89 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 17 Sep 2023 09:37:51 -0400 Subject: [PATCH 22/70] cargo-tarpaulin: 0.26.1 -> 0.27.0 Diff: https://github.com/xd009642/tarpaulin/compare/0.26.1...0.27.0 Changelog: https://github.com/xd009642/tarpaulin/blob/0.27.0/CHANGELOG.md --- pkgs/development/tools/analysis/cargo-tarpaulin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index ebacdbfc4c6a..c18d42b60ffd 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.26.1"; + version = "0.27.0"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - hash = "sha256-FQdYos8hnQMkl/3vM9kSj0LM8fIZcsWMLKimpNXnrFo="; + hash = "sha256-yvZVViD7QbVTQ/gEcoSrE7jdQH7gR20LpXWsC8DHE9w="; }; - cargoHash = "sha256-fCoZ1pSKPXvNSWiAfhPygidkM0Ek7DYtHHv/sdPptvM="; + cargoHash = "sha256-0uowFaPkDUkDozd2DCsOfZzz3gMQpkL6PdKBzy1d+wg="; nativeBuildInputs = [ pkg-config From 0063c5a5b649f3f060ff9d8fc9ce10df8a93af77 Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Sun, 17 Sep 2023 15:53:10 +0200 Subject: [PATCH 23/70] todoman: 4.3.1 -> 4.3.2 Changelog: https://github.com/pimutils/todoman/blob/v4.3.2/CHANGELOG.rst Also adds myself as maintainer --- pkgs/applications/office/todoman/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 10334d6c4157..813c29e1ef50 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "todoman"; - version = "4.3.1"; + version = "4.3.2"; format = "pyproject"; src = fetchFromGitHub { owner = "pimutils"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pa1zzu0ITJObzhSmohjgiGTCoautXrY+SQQ3hxEtQcE="; + hash = "sha256-dxyI9ypZZBouTUF72wzvi7j+CeoQ9JNSiXrVeV7ForY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -92,7 +92,7 @@ python3.pkgs.buildPythonApplication rec { ''; changelog = "https://github.com/pimutils/todoman/raw/v${version}/CHANGELOG.rst"; license = licenses.isc; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars antonmosich ]; mainProgram = "todo"; }; } From 75145d37dc87e505bd065b62a6b29177e5077fa5 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 17 Sep 2023 10:31:49 -0400 Subject: [PATCH 24/70] fx: 24.1.0 -> 30.0.0 Diff: https://github.com/antonmedv/fx/compare/24.1.0...30.0.0 Changelog: https://github.com/antonmedv/fx/releases/tag/30.0.0 --- pkgs/development/tools/fx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/fx/default.nix b/pkgs/development/tools/fx/default.nix index 9e478867445e..537cfe5c1d6f 100644 --- a/pkgs/development/tools/fx/default.nix +++ b/pkgs/development/tools/fx/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fx"; - version = "24.1.0"; + version = "30.0.0"; src = fetchFromGitHub { owner = "antonmedv"; repo = pname; rev = version; - hash = "sha256-X6wuCAiQa1coHMz96aAXKGZFnius1vHJpk+EhbXqoMA="; + hash = "sha256-MRWDitL9nATi6+oaOJ/A+iaNLztWBZ+Mrs7Hkt0lhL8="; }; - vendorHash = "sha256-J19MhLvjxcxvcub888UFKI0iIf7OG3dmP5v40ElHCU4="; + vendorHash = "sha256-cIyh/FC1lcUgPeUZKrh+kCZmSKGE7Bo411eI0dZeMx4="; meta = with lib; { description = "Terminal JSON viewer"; From d494f4a4ba501c2fd2ff5be8cbf54d43d79f0a8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Sep 2023 22:51:04 +0000 Subject: [PATCH 25/70] libquotient: 0.8.1.1 -> 0.8.1.2 --- pkgs/development/libraries/libquotient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix index 6300ece17127..2dd4cc6663a9 100644 --- a/pkgs/development/libraries/libquotient/default.nix +++ b/pkgs/development/libraries/libquotient/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libquotient"; - version = "0.8.1.1"; + version = "0.8.1.2"; src = fetchFromGitHub { owner = "quotient-im"; repo = "libQuotient"; rev = version; - hash = "sha256-WNLwO2w8FYy12BeqPuiS0wg3fUMwTxfrIF1QwcjE9yQ="; + hash = "sha256-qJTikc42sFUlb4g0sAEg6v9d4k1lhbn3MZPvghm56E8="; }; buildInputs = [ olm openssl qtbase qtmultimedia qtkeychain ]; From 743a0e7463319b91ce5f6439ff23aa1318124ac4 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Sun, 17 Sep 2023 16:33:45 -0700 Subject: [PATCH 26/70] cardinal: 23.07 -> 23.09 --- pkgs/applications/audio/cardinal/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/applications/audio/cardinal/default.nix index 225970b8018e..731cb63c4da2 100644 --- a/pkgs/applications/audio/cardinal/default.nix +++ b/pkgs/applications/audio/cardinal/default.nix @@ -1,5 +1,4 @@ -{ - stdenv +{ stdenv , fetchFromGitHub , fetchurl , cmake @@ -28,11 +27,11 @@ stdenv.mkDerivation rec { pname = "cardinal"; - version = "23.07"; + version = "23.09"; src = fetchurl { url = "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz"; - hash = "sha256-Ng2E6ML9lffmdGgn9piIF3ko4uvV/uLDb3d7ytrfcLU="; + hash = "sha256-q42ry47y4tTkUbejv6iN5jXcadXSSTPQ3omhMUevfqU="; }; prePatch = '' @@ -87,7 +86,7 @@ stdenv.mkDerivation rec { description = "Plugin wrapper around VCV Rack"; homepage = "https://github.com/DISTRHO/cardinal"; license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.magnetophon ]; + maintainers = with lib.maintainers; [ magnetophon PowerUser64 ]; mainProgram = "Cardinal"; platforms = lib.platforms.all; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs From 84397fa9afcbacab6579654c7f6ed36b0cec9ed2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Sep 2023 06:34:36 +0000 Subject: [PATCH 27/70] argo-rollouts: 1.5.1 -> 1.6.0 --- .../networking/cluster/argo-rollouts/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/argo-rollouts/default.nix b/pkgs/applications/networking/cluster/argo-rollouts/default.nix index 4c5a1b211303..ade1527b6e42 100644 --- a/pkgs/applications/networking/cluster/argo-rollouts/default.nix +++ b/pkgs/applications/networking/cluster/argo-rollouts/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "argo-rollouts"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-rollouts"; rev = "v${version}"; - sha256 = "sha256-ODcT7dc4xBHOKYTP2pUTq2z3GMUEpZ9OUKKxlbd+Vvk="; + sha256 = "sha256-WJ5vIfQQguwjInS5p+bUYorM90MUAbH8endV/nkgQ00="; }; - vendorHash = "sha256-IxSLlRsOz/Xamguxm+7jy8qAAEZZFm/NHDIBjm5tnCs="; + vendorHash = "sha256-vBSS1KMfloK5pvVc8nHE5B8PsVZTS/iA9GyrLaeR6ps="; # Disable tests since some test fail because of missing test data doCheck = false; From 6bd6bd649ab88e5f09462af17869371d16ef5d24 Mon Sep 17 00:00:00 2001 From: Jan Votava Date: Mon, 18 Sep 2023 09:16:59 +0000 Subject: [PATCH 28/70] timoni: 0.12.1 -> 0.13.1 --- .../applications/networking/cluster/timoni/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/timoni/default.nix b/pkgs/applications/networking/cluster/timoni/default.nix index 8f60c767771f..317207f2ed97 100644 --- a/pkgs/applications/networking/cluster/timoni/default.nix +++ b/pkgs/applications/networking/cluster/timoni/default.nix @@ -1,21 +1,21 @@ { lib -, buildGoModule +, buildGo121Module , fetchFromGitHub , installShellFiles }: -buildGoModule rec { +buildGo121Module rec { pname = "timoni"; - version = "0.12.1"; + version = "0.13.1"; src = fetchFromGitHub { owner = "stefanprodan"; repo = "timoni"; rev = "v${version}"; - hash = "sha256-GILJAaid1kSO9281HQx7NI+mjmyJbTYTkwhvX4V/Idc="; + hash = "sha256-fuDc9EMSjBE0DiZ+OiuRXTRlxnO4/2yxkDsdKpVdg5w="; }; - vendorHash = "sha256-nGYAk9dwQ/+3SmNqGzbpptqBDAO/vNT9jhlcJf4y8jg="; + vendorHash = "sha256-RdfFesMgQU+Iezg9tE3RJ0Tk6jjIWY+ByJoKqUVWHwA="; subPackages = [ "cmd/timoni" ]; nativeBuildInputs = [ installShellFiles ]; From 742f2ff317ff984124958f856684b95a0fed9063 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 18 Sep 2023 13:49:57 +0300 Subject: [PATCH 29/70] monkeysAudio: add meta.mainProgram --- pkgs/applications/audio/monkeys-audio/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index b5553e0a6005..e0d3504bdbcd 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "APE codec and decompressor"; platforms = platforms.linux; + mainProgram = "mac"; # This is not considered a GPL license, but it seems rather free although # it's not standard, see a quote of it: # https://github.com/NixOS/nixpkgs/pull/171682#issuecomment-1120260551 From e57121b8cad3c9a7a387f1bd818fa259bbf1bc21 Mon Sep 17 00:00:00 2001 From: linsui Date: Mon, 18 Sep 2023 19:00:39 +0800 Subject: [PATCH 30/70] pot: 2.3.0 -> 2.4.2 --- pkgs/applications/misc/pot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/pot/default.nix b/pkgs/applications/misc/pot/default.nix index ff919b44cd53..bb907e30df0c 100644 --- a/pkgs/applications/misc/pot/default.nix +++ b/pkgs/applications/misc/pot/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "pot"; - version = "2.3.0"; + version = "2.4.2"; src = fetchFromGitHub { owner = "pot-app"; repo = "pot-desktop"; rev = version; - hash = "sha256-KVrm7KEpIIahd/QU1HUJ2VkfECttcY5pRCHsYHS5svM="; + hash = "sha256-n12uO5QbD/HgD5Rq5d+TQ8j8Gn5hl6wTi27TqFmunIM="; }; sourceRoot = "${src.name}/src-tauri"; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashMode = "recursive"; - outputHash = "sha256-iHFzv8dMC0TT6PtMJmL0EufZ8TnbyjmsoBH3Z8U48D0="; + outputHash = "sha256-/5bB4czTPS3ZM9f7NBIHbwd95BqY2dRwKaBOWVsef04="; }; cargoDeps = rustPlatform.importCargoLock { From 2ea050d3787d5f000fc1eb374061dd315d083c5a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 18 Sep 2023 14:38:25 +0200 Subject: [PATCH 31/70] ponyc: fix build on darwin --- pkgs/development/compilers/ponyc/default.nix | 14 +++++++++--- .../compilers/ponyc/fix-darwin-build.patch | 22 +++++++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/compilers/ponyc/fix-darwin-build.patch diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index f22fb6fece1a..c7008ec22a8a 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -13,6 +13,7 @@ , substituteAll , which , z3 +, darwin }: stdenv.mkDerivation (rec { @@ -34,7 +35,8 @@ stdenv.mkDerivation (rec { hash = "sha256-pUW9YVaujs/y00/SiPqDgK4wvVsaM7QUp/65k0t7Yr0="; }; - nativeBuildInputs = [ cmake makeWrapper which python3 ]; + nativeBuildInputs = [ cmake makeWrapper which python3 ] + ++ lib.optionals (stdenv.isDarwin) [ darwin.cctools ]; buildInputs = [ libxml2 z3 ]; # Sandbox disallows network access, so disabling problematic networking tests @@ -50,6 +52,11 @@ stdenv.mkDerivation (rec { hash = "sha256-/FWBSxZESwj/QvdNK5BI2EfonT64DP1eGBZR4O8uJww="; }; }) + ] ++ lib.optionals stdenv.isDarwin [ + (substituteAll { + src = ./fix-darwin-build.patch; + libSystem = darwin.Libsystem; + }) ]; postUnpack = '' @@ -81,7 +88,8 @@ stdenv.mkDerivation (rec { env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=redundant-move" "-Wno-error=implicit-fallthrough" ]; - doCheck = true; + # make: *** [Makefile:222: test-full-programs-release] Killed: 9 + doCheck = !stdenv.isDarwin; installPhase = "make config=release prefix=$out " + lib.optionalString stdenv.isDarwin ("bits=64 " + (lib.optionalString (!lto) "lto=no ")) @@ -102,6 +110,6 @@ stdenv.mkDerivation (rec { homepage = "https://www.ponylang.org"; license = licenses.bsd2; maintainers = with maintainers; [ kamilchm patternspandemic redvers ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; }; }) diff --git a/pkgs/development/compilers/ponyc/fix-darwin-build.patch b/pkgs/development/compilers/ponyc/fix-darwin-build.patch new file mode 100644 index 000000000000..2570145da8de --- /dev/null +++ b/pkgs/development/compilers/ponyc/fix-darwin-build.patch @@ -0,0 +1,22 @@ +diff --git a/src/libponyc/codegen/genexe.c b/src/libponyc/codegen/genexe.c +index 42a68251..b37958ab 100644 +--- a/src/libponyc/codegen/genexe.c ++++ b/src/libponyc/codegen/genexe.c +@@ -296,13 +296,13 @@ static bool link_exe(compile_t* c, ast_t* program, + + snprintf(ld_cmd, ld_len, + #if defined(PLATFORM_IS_ARM) +- "%s -execute -arch %.*s " ++ "%s -execute " + #else +- "%s -execute -no_pie -arch %.*s " ++ "%s -execute -no_pie " + #endif + "-o %s %s %s %s " +- "-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib -lSystem %s", +- linker, (int)arch_len, c->opt->triple, file_exe, file_o, ++ "-L@libSystem@/lib -lSystem %s", ++ linker, file_exe, file_o, + lib_args, ponyrt, sanitizer_arg + ); + From 1f9360dabb824ba689e692d9093d27d7c2807092 Mon Sep 17 00:00:00 2001 From: Alistair Grant Date: Mon, 18 Sep 2023 15:25:56 +0200 Subject: [PATCH 32/70] glamoroustoolkit: 0.7.3 -> 0.8.1 --- pkgs/development/tools/glamoroustoolkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/glamoroustoolkit/default.nix b/pkgs/development/tools/glamoroustoolkit/default.nix index 814eb368929e..52e29b6102a3 100644 --- a/pkgs/development/tools/glamoroustoolkit/default.nix +++ b/pkgs/development/tools/glamoroustoolkit/default.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "glamoroustoolkit"; - version = "0.7.3"; + version = "0.8.1"; src = fetchzip { url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; stripRoot = false; - hash = "sha256-xkGip3RN44SZhYbogxUabO2EDsrRUZAJ+qAOEGdBgQ4="; + hash = "sha256-g33Lsa0aX1NvmtSlVVVrnjOvR0FhXasxZd5Sul6adfs="; }; sourceRoot = "."; From 794fb0217fe4a2aa098355422e8b6f64f1adc534 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Mon, 18 Sep 2023 15:34:08 +0200 Subject: [PATCH 33/70] libuninameslist: 20221022 -> 20230916 --- pkgs/development/libraries/libuninameslist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libuninameslist/default.nix b/pkgs/development/libraries/libuninameslist/default.nix index 7915e7b50f6b..3cbb78d83ce9 100644 --- a/pkgs/development/libraries/libuninameslist/default.nix +++ b/pkgs/development/libraries/libuninameslist/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libuninameslist"; - version = "20221022"; + version = "20230916"; src = fetchFromGitHub { owner = "fontforge"; repo = pname; rev = version; - sha256 = "sha256-YLlSe2++DpcptuAxLduTYAY2m9D8JSGDcvzijpAv1rU="; + sha256 = "sha256-8mLXTvi4KbU4NiCPaJINTeFbnTAabGDg8ufpSHSqy0Y="; }; nativeBuildInputs = [ From a6fe29c2fbdc05d2d19e243505cda257e853b990 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 18 Sep 2023 09:37:55 -0400 Subject: [PATCH 34/70] wasmer: disable tests --- pkgs/development/interpreters/wasmer/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index 32cdf2efedd9..ee9dcd66bc59 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -54,6 +54,9 @@ rustPlatform.buildRustPackage rec { env.LLVM_SYS_140_PREFIX = lib.optionalString withLLVM llvmPackages.llvm.dev; + # Tests are failing due to `Cannot allocate memory` and other reasons + doCheck = false; + meta = with lib; { description = "The Universal WebAssembly Runtime"; longDescription = '' From 90036927a909c7e9f77560970b2d7d4de4d72698 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 18 Sep 2023 16:41:59 +0300 Subject: [PATCH 35/70] monkeysAudio: give stdenv.mkDerivation a function --- pkgs/applications/audio/monkeys-audio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index e0d3504bdbcd..bb11921823ca 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -4,13 +4,13 @@ , cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "10.22"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${ - builtins.concatStringsSep "" (lib.strings.splitString "." version)}_SDK.zip"; + builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; sha256 = "sha256-JmDH9IudtuJdu1kSDI1RNaYiIgmPgH4RT2Myz9ihQH4="; stripRoot = false; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { license = licenses.free; maintainers = with maintainers; [ doronbehar ]; }; -} +}) From d82098c215ec37780158974708d0d6f6ac1facc2 Mon Sep 17 00:00:00 2001 From: illustris Date: Mon, 18 Sep 2023 18:14:27 +0530 Subject: [PATCH 36/70] cloud-init: 23.2.2 -> 23.3.1 --- .../cloud-init/0001-add-nixos-support.patch | 8 +- .../cloud-init/0002-Add-Udhcpc-support.patch | 421 ------------------ .../virtualization/cloud-init/default.nix | 12 +- 3 files changed, 12 insertions(+), 429 deletions(-) delete mode 100644 pkgs/tools/virtualization/cloud-init/0002-Add-Udhcpc-support.patch diff --git a/pkgs/tools/virtualization/cloud-init/0001-add-nixos-support.patch b/pkgs/tools/virtualization/cloud-init/0001-add-nixos-support.patch index f26690bacb70..2e293321ac02 100644 --- a/pkgs/tools/virtualization/cloud-init/0001-add-nixos-support.patch +++ b/pkgs/tools/virtualization/cloud-init/0001-add-nixos-support.patch @@ -1,10 +1,10 @@ diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py -index b82852e1..c998b21e 100644 +index 7b83df8d..6d04de1a 100644 --- a/cloudinit/distros/__init__.py +++ b/cloudinit/distros/__init__.py -@@ -74,6 +74,7 @@ OSFAMILIES = { +@@ -75,6 +75,7 @@ OSFAMILIES = { ], - "openEuler": ["openEuler"], + "openeuler": ["openeuler"], "OpenCloudOS": ["OpenCloudOS", "TencentOS"], + "nixos": ["nixos"], } @@ -12,7 +12,7 @@ index b82852e1..c998b21e 100644 LOG = logging.getLogger(__name__) diff --git a/cloudinit/distros/nixos.py b/cloudinit/distros/nixos.py new file mode 100644 -index 00000000..d53d2a62 +index 00000000..954e564b --- /dev/null +++ b/cloudinit/distros/nixos.py @@ -0,0 +1,109 @@ diff --git a/pkgs/tools/virtualization/cloud-init/0002-Add-Udhcpc-support.patch b/pkgs/tools/virtualization/cloud-init/0002-Add-Udhcpc-support.patch deleted file mode 100644 index 0df3f27a2c40..000000000000 --- a/pkgs/tools/virtualization/cloud-init/0002-Add-Udhcpc-support.patch +++ /dev/null @@ -1,421 +0,0 @@ -From 53260ce3bd70a0852d3e0d5569474214cea0ec0c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= -Date: Mon, 19 Jun 2023 15:56:46 +0200 -Subject: [PATCH] net/dhcp: add udhcpc support - -The currently used dhcp client, dhclient, is coming from the unmaintained package, isc-dhcp-client (refer https://www.isc.org/dhcp/) which ended support in 2022. - -This change introduce support for the dhcp client, udhcpc, from the busybox project. Busybox advantages are that it is available across many distributions and comes with lightweight executables. ---- - cloudinit/distros/__init__.py | 8 +- - cloudinit/net/dhcp.py | 129 ++++++++++++++++++++++- - tests/unittests/net/test_dhcp.py | 175 ++++++++++++++++++++++++++++++- - tools/.github-cla-signers | 1 + - 4 files changed, 309 insertions(+), 4 deletions(-) - -diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py -index ec148939..0fab8945 100644 ---- a/cloudinit/distros/__init__.py -+++ b/cloudinit/distros/__init__.py -@@ -110,14 +110,18 @@ class Distro(persistence.CloudInitPickleMixin, metaclass=abc.ABCMeta): - resolve_conf_fn = "/etc/resolv.conf" - - osfamily: str -- dhcp_client_priority = [dhcp.IscDhclient, dhcp.Dhcpcd] -+ dhcp_client_priority = [dhcp.IscDhclient, dhcp.Dhcpcd, dhcp.Udhcpc] - - def __init__(self, name, cfg, paths): - self._paths = paths - self._cfg = cfg - self.name = name - self.networking: Networking = self.networking_cls() -- self.dhcp_client_priority = [dhcp.IscDhclient, dhcp.Dhcpcd] -+ self.dhcp_client_priority = [ -+ dhcp.IscDhclient, -+ dhcp.Dhcpcd, -+ dhcp.Udhcpc, -+ ] - - def _unpickle(self, ci_pkl_version: int) -> None: - """Perform deserialization fixes for Distro.""" -diff --git a/cloudinit/net/dhcp.py b/cloudinit/net/dhcp.py -index 6c8c2f54..f5586cea 100644 ---- a/cloudinit/net/dhcp.py -+++ b/cloudinit/net/dhcp.py -@@ -21,6 +21,7 @@ from cloudinit import subp, temp_utils, util - from cloudinit.net import ( - find_fallback_nic, - get_devicelist, -+ get_ib_interface_hwaddr, - get_interface_mac, - is_ib_interface, - ) -@@ -28,6 +29,37 @@ from cloudinit.net import ( - LOG = logging.getLogger(__name__) - - NETWORKD_LEASES_DIR = "/run/systemd/netif/leases" -+UDHCPC_SCRIPT = """#!/bin/sh -+log() { -+ echo "udhcpc[$PPID]" "$interface: $2" -+} -+[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 -+case $1 in -+ bound|renew) -+ cat < "$LEASE_FILE" -+{ -+ "interface": "$interface", -+ "fixed-address": "$ip", -+ "subnet-mask": "$subnet", -+ "routers": "${router%% *}", -+ "static_routes" : "${staticroutes}" -+} -+JSON -+ ;; -+ deconfig) -+ log err "Not supported" -+ exit 1 -+ ;; -+ leasefail | nak) -+ log err "configuration failed: $1: $message" -+ exit 1 -+ ;; -+ *) -+ echo "$0: Unknown udhcpc command: $1" >&2 -+ exit 1 -+ ;; -+esac -+""" - - - class NoDHCPLeaseError(Exception): -@@ -50,6 +82,10 @@ class NoDHCPLeaseMissingDhclientError(NoDHCPLeaseError): - """Raised when unable to find dhclient.""" - - -+class NoDHCPLeaseMissingUdhcpcError(NoDHCPLeaseError): -+ """Raised when unable to find udhcpc client.""" -+ -+ - def select_dhcp_client(distro): - """distros set priority list, select based on this order which to use - -@@ -60,7 +96,10 @@ def select_dhcp_client(distro): - dhcp_client = client() - LOG.debug("DHCP client selected: %s", client.client_name) - return dhcp_client -- except NoDHCPLeaseMissingDhclientError: -+ except ( -+ NoDHCPLeaseMissingDhclientError, -+ NoDHCPLeaseMissingUdhcpcError, -+ ): - LOG.warning("DHCP client not found: %s", client.client_name) - raise NoDHCPLeaseMissingDhclientError() - -@@ -497,3 +536,91 @@ class Dhcpcd: - - def __init__(self): - raise NoDHCPLeaseMissingDhclientError("Dhcpcd not yet implemented") -+ -+ -+class Udhcpc(DhcpClient): -+ client_name = "udhcpc" -+ -+ def __init__(self): -+ self.udhcpc_path = subp.which("udhcpc") -+ if not self.udhcpc_path: -+ LOG.debug("Skip udhcpc configuration: No udhcpc command found.") -+ raise NoDHCPLeaseMissingUdhcpcError() -+ -+ def dhcp_discovery( -+ self, -+ interface, -+ dhcp_log_func=None, -+ distro=None, -+ ): -+ """Run udhcpc on the interface without scripts or filesystem artifacts. -+ -+ @param interface: Name of the network interface on which to run udhcpc. -+ @param dhcp_log_func: A callable accepting the udhcpc output and -+ error streams. -+ -+ @return: A list of dicts of representing the dhcp leases parsed from -+ the udhcpc lease file. -+ """ -+ LOG.debug("Performing a dhcp discovery on %s", interface) -+ -+ tmp_dir = temp_utils.get_tmp_ancestor(needs_exe=True) -+ lease_file = os.path.join(tmp_dir, interface + ".lease.json") -+ with contextlib.suppress(FileNotFoundError): -+ os.remove(lease_file) -+ -+ # udhcpc needs the interface up to send initial discovery packets -+ subp.subp(["ip", "link", "set", "dev", interface, "up"], capture=True) -+ -+ udhcpc_script = os.path.join(tmp_dir, "udhcpc_script") -+ util.write_file(udhcpc_script, UDHCPC_SCRIPT, 0o755) -+ -+ cmd = [ -+ self.udhcpc_path, -+ "-O", -+ "staticroutes", -+ "-i", -+ interface, -+ "-s", -+ udhcpc_script, -+ "-n", # Exit if lease is not obtained -+ "-q", # Exit after obtaining lease -+ "-f", # Run in foreground -+ "-v", -+ ] -+ -+ # For INFINIBAND port the dhcpc must be running with -+ # client id option. So here we are checking if the interface is -+ # INFINIBAND or not. If yes, we are generating the the client-id to be -+ # used with the udhcpc -+ if is_ib_interface(interface): -+ dhcp_client_identifier = get_ib_interface_hwaddr( -+ interface, ethernet_format=True -+ ) -+ cmd.extend( -+ ["-x", "0x3d:%s" % dhcp_client_identifier.replace(":", "")] -+ ) -+ try: -+ out, err = subp.subp( -+ cmd, update_env={"LEASE_FILE": lease_file}, capture=True -+ ) -+ except subp.ProcessExecutionError as error: -+ LOG.debug( -+ "udhcpc exited with code: %s stderr: %r stdout: %r", -+ error.exit_code, -+ error.stderr, -+ error.stdout, -+ ) -+ raise NoDHCPLeaseError from error -+ -+ if dhcp_log_func is not None: -+ dhcp_log_func(out, err) -+ -+ lease_json = util.load_json(util.load_file(lease_file)) -+ static_routes = lease_json["static_routes"].split() -+ if static_routes: -+ # format: dest1/mask gw1 ... destn/mask gwn -+ lease_json["static_routes"] = [ -+ i for i in zip(static_routes[::2], static_routes[1::2]) -+ ] -+ return [lease_json] -diff --git a/tests/unittests/net/test_dhcp.py b/tests/unittests/net/test_dhcp.py -index 55d4c6e9..9123cd15 100644 ---- a/tests/unittests/net/test_dhcp.py -+++ b/tests/unittests/net/test_dhcp.py -@@ -13,6 +13,8 @@ from cloudinit.net.dhcp import ( - NoDHCPLeaseError, - NoDHCPLeaseInterfaceError, - NoDHCPLeaseMissingDhclientError, -+ NoDHCPLeaseMissingUdhcpcError, -+ Udhcpc, - maybe_perform_dhcp_discovery, - networkd_load_leases, - ) -@@ -388,11 +390,13 @@ class TestDHCPDiscoveryClean(CiTestCase): - self.logs.getvalue(), - ) - -+ @mock.patch("cloudinit.temp_utils.get_tmp_ancestor", return_value="/tmp") - @mock.patch("cloudinit.net.dhcp.find_fallback_nic", return_value="eth9") - @mock.patch("cloudinit.net.dhcp.os.remove") - @mock.patch("cloudinit.net.dhcp.subp.subp") - @mock.patch("cloudinit.net.dhcp.subp.which") -- def test_dhcp_client_failover(self, m_which, m_subp, m_remove, m_fallback): -+ def test_dhcp_client_failover(self, m_which, m_subp, m_remove, m_fallback, -+ m_get_tmp_ancestor): - """Log and do nothing when nic is absent and no fallback is found.""" - m_subp.side_effect = [ - ("", ""), -@@ -928,3 +932,172 @@ class TestEphemeralDhcpLeaseErrors: - pass - - assert len(m_dhcp.mock_calls) == 1 -+ -+ -+class TestUDHCPCDiscoveryClean(CiTestCase): -+ with_logs = True -+ maxDiff = None -+ -+ @mock.patch("cloudinit.temp_utils.get_tmp_ancestor", return_value="/tmp") -+ @mock.patch("cloudinit.net.dhcp.subp.which") -+ @mock.patch("cloudinit.net.dhcp.find_fallback_nic") -+ def test_absent_udhcpc_command(self, m_fallback, m_which, -+ m_get_tmp_ancestor): -+ """When dhclient doesn't exist in the OS, log the issue and no-op.""" -+ m_fallback.return_value = "eth9" -+ m_which.return_value = None # udhcpc isn't found -+ -+ distro = MockDistro() -+ distro.dhcp_client_priority = [Udhcpc] -+ -+ with pytest.raises(NoDHCPLeaseMissingDhclientError): -+ maybe_perform_dhcp_discovery(distro) -+ -+ self.assertIn( -+ "Skip udhcpc configuration: No udhcpc command found.", -+ self.logs.getvalue(), -+ ) -+ -+ @mock.patch("cloudinit.temp_utils.get_tmp_ancestor", return_value="/tmp") -+ @mock.patch("cloudinit.net.dhcp.is_ib_interface", return_value=False) -+ @mock.patch("cloudinit.net.dhcp.subp.which", return_value="/sbin/udhcpc") -+ @mock.patch("cloudinit.net.dhcp.os.remove") -+ @mock.patch("cloudinit.net.dhcp.subp.subp") -+ @mock.patch("cloudinit.util.load_json") -+ @mock.patch("cloudinit.util.load_file") -+ @mock.patch("cloudinit.util.write_file") -+ def test_udhcpc_discovery( -+ self, -+ m_write_file, -+ m_load_file, -+ m_loadjson, -+ m_subp, -+ m_remove, -+ m_which, -+ mocked_is_ib_interface, -+ m_get_tmp_ancestor, -+ ): -+ """dhcp_discovery runs udcpc and parse the dhcp leases.""" -+ m_subp.return_value = ("", "") -+ m_loadjson.return_value = { -+ "interface": "eth9", -+ "fixed-address": "192.168.2.74", -+ "subnet-mask": "255.255.255.0", -+ "routers": "192.168.2.1", -+ "static_routes": "10.240.0.1/32 0.0.0.0 0.0.0.0/0 10.240.0.1", -+ } -+ self.assertEqual( -+ [ -+ { -+ "fixed-address": "192.168.2.74", -+ "interface": "eth9", -+ "routers": "192.168.2.1", -+ "static_routes": [ -+ ("10.240.0.1/32", "0.0.0.0"), -+ ("0.0.0.0/0", "10.240.0.1"), -+ ], -+ "subnet-mask": "255.255.255.0", -+ } -+ ], -+ Udhcpc().dhcp_discovery("eth9", distro=MockDistro()), -+ ) -+ # Interface was brought up before dhclient called -+ m_subp.assert_has_calls( -+ [ -+ mock.call( -+ ["ip", "link", "set", "dev", "eth9", "up"], -+ capture=True, -+ ), -+ mock.call( -+ [ -+ "/sbin/udhcpc", -+ "-O", -+ "staticroutes", -+ "-i", -+ "eth9", -+ "-s", -+ "/tmp/udhcpc_script", -+ "-n", -+ "-q", -+ "-f", -+ "-v", -+ ], -+ update_env={"LEASE_FILE": "/tmp/eth9.lease.json"}, -+ capture=True, -+ ), -+ ] -+ ) -+ -+ @mock.patch("cloudinit.temp_utils.get_tmp_ancestor", return_value="/tmp") -+ @mock.patch("cloudinit.net.dhcp.is_ib_interface", return_value=True) -+ @mock.patch("cloudinit.net.dhcp.get_ib_interface_hwaddr") -+ @mock.patch("cloudinit.net.dhcp.subp.which", return_value="/sbin/udhcpc") -+ @mock.patch("cloudinit.net.dhcp.os.remove") -+ @mock.patch("cloudinit.net.dhcp.subp.subp") -+ @mock.patch("cloudinit.util.load_json") -+ @mock.patch("cloudinit.util.load_file") -+ @mock.patch("cloudinit.util.write_file") -+ def test_udhcpc_discovery_ib( -+ self, -+ m_write_file, -+ m_load_file, -+ m_loadjson, -+ m_subp, -+ m_remove, -+ m_which, -+ m_get_ib_interface_hwaddr, -+ m_is_ib_interface, -+ m_get_tmp_ancestor, -+ ): -+ """dhcp_discovery runs udcpc and parse the dhcp leases.""" -+ m_subp.return_value = ("", "") -+ m_loadjson.return_value = { -+ "interface": "ib0", -+ "fixed-address": "192.168.2.74", -+ "subnet-mask": "255.255.255.0", -+ "routers": "192.168.2.1", -+ "static_routes": "10.240.0.1/32 0.0.0.0 0.0.0.0/0 10.240.0.1", -+ } -+ m_get_ib_interface_hwaddr.return_value = "00:21:28:00:01:cf:4b:01" -+ self.assertEqual( -+ [ -+ { -+ "fixed-address": "192.168.2.74", -+ "interface": "ib0", -+ "routers": "192.168.2.1", -+ "static_routes": [ -+ ("10.240.0.1/32", "0.0.0.0"), -+ ("0.0.0.0/0", "10.240.0.1"), -+ ], -+ "subnet-mask": "255.255.255.0", -+ } -+ ], -+ Udhcpc().dhcp_discovery("ib0", distro=MockDistro()), -+ ) -+ # Interface was brought up before dhclient called -+ m_subp.assert_has_calls( -+ [ -+ mock.call( -+ ["ip", "link", "set", "dev", "ib0", "up"], capture=True -+ ), -+ mock.call( -+ [ -+ "/sbin/udhcpc", -+ "-O", -+ "staticroutes", -+ "-i", -+ "ib0", -+ "-s", -+ "/tmp/udhcpc_script", -+ "-n", -+ "-q", -+ "-f", -+ "-v", -+ "-x", -+ "0x3d:0021280001cf4b01", -+ ], -+ update_env={"LEASE_FILE": "/tmp/ib0.lease.json"}, -+ capture=True, -+ ), -+ ] -+ ) -diff --git a/tools/.github-cla-signers b/tools/.github-cla-signers -index b4a9326e..4d82a055 100644 ---- a/tools/.github-cla-signers -+++ b/tools/.github-cla-signers -@@ -65,6 +65,7 @@ jacobsalmela - jamesottinger - Jehops - jf -+jfroche - Jille - JohnKepplers - johnsonshi --- -2.40.1 - diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 5b85bae033af..edf456d3094e 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -12,24 +12,23 @@ , coreutils , gitUpdater , busybox +, procps }: python3.pkgs.buildPythonApplication rec { pname = "cloud-init"; - version = "23.2.2"; + version = "23.3.1"; namePrefix = ""; src = fetchFromGitHub { owner = "canonical"; repo = "cloud-init"; rev = "refs/tags/${version}"; - hash = "sha256-lOeLVgT/qTB6JhRcLv9QIfNLMnMyNlUp3dMCqva9Tes="; + hash = "sha256-3UxTqlhLZi/3/buWqDGto4cZN03uONbA8HEWQtaIRxU="; }; patches = [ ./0001-add-nixos-support.patch - # upstream: https://github.com/canonical/cloud-init/pull/4190 - ./0002-Add-Udhcpc-support.patch ]; prePatch = '' @@ -71,10 +70,12 @@ python3.pkgs.buildPythonApplication rec { httpretty dmidecode # needed for tests; at runtime we rather want the setuid wrapper + passlib shadow responses pytest-mock coreutils + procps ]; makeWrapperArgs = [ @@ -84,8 +85,11 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ # tries to create /var "test_dhclient_run_with_tmpdir" + "test_dhcp_client_failover" # clears path and fails because mkdir is not found "test_path_env_gets_set_from_main" + # fails to find cat + "test_subp_combined_stderr_stdout" # tries to read from /etc/ca-certificates.conf while inside the sandbox "test_handler_ca_certs" "TestRemoveDefaultCaCerts" From 5ee9b315dcc6b510fde80c7896807e03023611c7 Mon Sep 17 00:00:00 2001 From: Alexander Flurie Date: Mon, 18 Sep 2023 09:47:03 -0400 Subject: [PATCH 37/70] github-runner: 2.308.0 -> 2.309.0 --- .../tools/continuous-integration/github-runner/default.nix | 4 ++-- .../tools/continuous-integration/github-runner/deps.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 0b1a21c2852b..96741dc8b252 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -24,13 +24,13 @@ assert builtins.all (x: builtins.elem x [ "node16" "node20" ]) nodeRuntimes; buildDotnetModule rec { pname = "github-runner"; - version = "2.308.0"; + version = "2.309.0"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-LrHScQbBkRPSNsfPxvE2+K9tON8xuR0e4JpKVuI+Gu0="; + hash = "sha256-P70kNcd5TjWsHj16y11SEYROGG+JUkpwE9eVpHzvTes="; leaveDotGit = true; postFetch = '' git -C $out rev-parse --short HEAD > $out/.git-revision diff --git a/pkgs/development/tools/continuous-integration/github-runner/deps.nix b/pkgs/development/tools/continuous-integration/github-runner/deps.nix index caa00cad9af2..bf6c56d8f85e 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/deps.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/deps.nix @@ -3,7 +3,7 @@ { fetchNuGet }: [ (fetchNuGet { pname = "Castle.Core"; version = "4.4.0"; sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; }) - (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.4"; sha256 = "00fkczf69z2rwarcd8kjjdp47517a0ca6lggn72qbilsp03a5scj"; }) + (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.9"; sha256 = "1sy1q36bm9fz3gi780w4jgysw3dwaz2f3a5gcn6jxw1gkmdasb08"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.2.0"; sha256 = "018yl113i037m5qhm3z6csb0c4l8kj412dxw2dagdbj07qbxwikj"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "5.2.1"; sha256 = "1gpka9jm2gl6f07pcwzwvaxw9xq1a19i9fskn0qs921c5grhlp3g"; }) @@ -29,7 +29,7 @@ (fetchNuGet { pname = "Moq"; version = "4.11.0"; sha256 = "08bnk80scjjqnkdbjam8grcqrw2rvj9z7556hiznac7in3fcp77w"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.5.0-rc2-24027"; sha256 = "1kazwidj63w53r1s6fd8sgykb70kdic27fg9qhg74qzwm354imwm"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) @@ -81,7 +81,7 @@ (fetchNuGet { pname = "System.AppContext"; version = "4.1.0-rc2-24027"; sha256 = "0c0x3sg12a5zwiamvxs9c4bhdwmmm9by6x5da58fbrzz7afbaaag"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.0.0-rc2-24027"; sha256 = "1mqnay87pkxih73984jf5fm14d0m6yjq4cv4cqbj37nmgm54ssjp"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.0.11-rc2-24027"; sha256 = "0ijpgf7iy3mcvr9327craxsb0lsznprajqzjy59sspc75gk0yahq"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) From 7efb824dac868bb23a1529ca83e12c9ca15403af Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 18 Sep 2023 09:49:57 -0400 Subject: [PATCH 38/70] qt6.qtgrpc: add patch for protobuf 23 support --- pkgs/development/libraries/qt-6/default.nix | 11 ++++++++++- pkgs/development/libraries/qt-6/modules/qtgrpc.nix | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index d0c298e51926..0dd6cd75df08 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -3,6 +3,7 @@ , stdenv , fetchurl , fetchpatch +, fetchpatch2 , makeSetupHook , makeWrapper , gst_all_1 @@ -104,7 +105,15 @@ let qtdatavis3d = callPackage ./modules/qtdatavis3d.nix { }; qtdeclarative = callPackage ./modules/qtdeclarative.nix { }; qtdoc = callPackage ./modules/qtdoc.nix { }; - qtgrpc = callPackage ./modules/qtgrpc.nix { }; + qtgrpc = callPackage ./modules/qtgrpc.nix { + patches = [ + (fetchpatch2 { + # fix compatibility with protobuf 23 + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-grpc/-/raw/d6b33bd915dc6e63b30db2cd29150d55b289d7ed/protobuf-23.patch"; + hash = "sha256-KQAcrjQ3rK9pDQUOUK6AS4ej8YvtRv9WZOxby31Y5r4="; + }) + ]; + }; qthttpserver = callPackage ./modules/qthttpserver.nix { }; qtimageformats = callPackage ./modules/qtimageformats.nix { }; qtlanguageserver = callPackage ./modules/qtlanguageserver.nix { }; diff --git a/pkgs/development/libraries/qt-6/modules/qtgrpc.nix b/pkgs/development/libraries/qt-6/modules/qtgrpc.nix index f2623dd3d566..877dd2371c27 100644 --- a/pkgs/development/libraries/qt-6/modules/qtgrpc.nix +++ b/pkgs/development/libraries/qt-6/modules/qtgrpc.nix @@ -3,10 +3,12 @@ , qtdeclarative , protobuf , grpc +, patches ? [] }: qtModule { pname = "qtgrpc"; qtInputs = [ qtbase qtdeclarative ]; buildInputs = [ protobuf grpc ]; + inherit patches; } From 87ddec764c228ca9b143b5f85252f4e686f0429f Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Mon, 18 Sep 2023 15:53:52 +0200 Subject: [PATCH 39/70] python3Packages.reorder-python-imports: 3.9.0 -> 3.11.0 Signed-off-by: Florian Brandes --- .../python-modules/reorder-python-imports/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/reorder-python-imports/default.nix b/pkgs/development/python-modules/reorder-python-imports/default.nix index 00efb26386ba..63cdb2fda21d 100644 --- a/pkgs/development/python-modules/reorder-python-imports/default.nix +++ b/pkgs/development/python-modules/reorder-python-imports/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "reorder-python-imports"; - version = "3.9.0"; - disabled = pythonOlder "3.7"; + version = "3.11.0"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "asottile"; repo = "reorder_python_imports"; rev = "v${version}"; - hash = "sha256-z8giVbW8+k/y9Kg+O2tMle5MoRAar2Gccx2YCtFQvxw="; + hash = "sha256-5fv2DSMeCleDxsW+nua2dOOeWZIZfuP+Qo++w2YEf4Q="; }; propagatedBuildInputs = [ From 2906a9fe40806a32113a2bb1fb4436dc6ce57aa2 Mon Sep 17 00:00:00 2001 From: Ivan Kovnatsky <75213+ivankovnatsky@users.noreply.github.com> Date: Mon, 18 Sep 2023 17:22:25 +0300 Subject: [PATCH 40/70] granted: remove broken attribute https://github.com/NixOS/nixpkgs/pull/255764#issuecomment-1723514189. --- pkgs/tools/admin/granted/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/tools/admin/granted/default.nix b/pkgs/tools/admin/granted/default.nix index 7cb1dc0cb1e2..26f618c714d9 100644 --- a/pkgs/tools/admin/granted/default.nix +++ b/pkgs/tools/admin/granted/default.nix @@ -62,10 +62,5 @@ buildGoModule rec { changelog = "https://github.com/common-fate/granted/releases/tag/${version}"; license = licenses.mit; maintainers = [ maintainers.ivankovnatsky ]; - # Could not figure out how to use this application without any hustle. Weird - # linking of binary, aliases for god knows what. - # https://docs.commonfate.io/granted/usage/assuming-roles. - # Will mark as broken until maybe someone fixes it. Switched to aws-sso. - broken = true; }; } From 00a68ebfd3ca6b0f68fe36278ade963289c207d7 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 18 Sep 2023 10:43:22 -0400 Subject: [PATCH 41/70] snazy: 0.52.0 -> 0.52.1 Diff: https://github.com/chmouel/snazy/compare/0.52.0...0.52.1 Changelog: https://github.com/chmouel/snazy/releases/tag/0.52.1 --- pkgs/development/tools/snazy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/snazy/default.nix b/pkgs/development/tools/snazy/default.nix index c3d104e87383..a0cf2c7c97d8 100644 --- a/pkgs/development/tools/snazy/default.nix +++ b/pkgs/development/tools/snazy/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "snazy"; - version = "0.52.0"; + version = "0.52.1"; src = fetchFromGitHub { owner = "chmouel"; repo = pname; rev = version; - hash = "sha256-ax16BO2I+LgaVilqrsVToulBRcyr0C/QUtrdn0nUfBU="; + hash = "sha256-OoUu42vRe4wPaunb2vJ9ITd0Q76pBI/yC8FI0J+J+ts="; }; - cargoHash = "sha256-go6y/NH3vFb8xtAGVpgy0GQfMfzXfn8hI+tJnUdCFAU="; + cargoHash = "sha256-gUeKZNSo/zJ4Nqy4Fpk5JuvFylGBlKJu+Nw9XWXVx0g="; nativeBuildInputs = [ installShellFiles ]; From be057ad0256d08728fdb9201bcffdc0d7f8ddb05 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 18 Sep 2023 11:07:52 -0400 Subject: [PATCH 42/70] risor: 0.17.0 -> 1.1.1 Diff: https://github.com/risor-io/risor/compare/v0.17.0...v1.1.1 Changelog: https://github.com/risor-io/risor/releases/tag/v1.1.1 --- pkgs/development/interpreters/risor/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/risor/default.nix b/pkgs/development/interpreters/risor/default.nix index 149d386fff39..5cb3854f30f0 100644 --- a/pkgs/development/interpreters/risor/default.nix +++ b/pkgs/development/interpreters/risor/default.nix @@ -1,23 +1,23 @@ { lib -, buildGoModule +, buildGo121Module , fetchFromGitHub , testers , risor }: -buildGoModule rec { +buildGo121Module rec { pname = "risor"; - version = "0.17.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "risor-io"; repo = "risor"; rev = "v${version}"; - hash = "sha256-/7jUz2180m+YVyE9z4UKOhVv0DSqrCWdkyAftluMHeo="; + hash = "sha256-7bWtlLo1fJQ7ddcg0MFUfeCn8VNkSEENxmp0O8cNTBE="; }; proxyVendor = true; - vendorHash = "sha256-OUQY5yzsbMS81gRb1mIvkRHal4mvOE2Na2HAsqkeWG4="; + vendorHash = "sha256-cV6TOvcquAOr4WQ3IzWOVtLuwjQf1BA+QXzzDYnPsYQ="; subPackages = [ "cmd/risor" From 2ed9b44d0c5249d1d17f5ff542030a380d7eca07 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 18 Sep 2023 17:08:17 +0200 Subject: [PATCH 43/70] libsForQt5.qtkeychain: fix build on x86_64-darwin --- pkgs/top-level/qt5-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 58c2e2001839..93cb2c9a1372 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -207,7 +207,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea qtinstaller = callPackage ../development/libraries/qtinstaller { }; qtkeychain = callPackage ../development/libraries/qtkeychain { - inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security; + stdenv = if pkgs.stdenv.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; + inherit (pkgs.darwin.apple_sdk_11_0.frameworks) CoreFoundation Security; }; qtmpris = callPackage ../development/libraries/qtmpris { }; From 1b721a908ca5fdd08be919eb5959db301b8f316b Mon Sep 17 00:00:00 2001 From: Icy-Thought Date: Mon, 18 Sep 2023 17:11:03 +0200 Subject: [PATCH 44/70] upscayl: 2.7.5 -> 2.8.1 --- pkgs/applications/graphics/upscayl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/upscayl/default.nix b/pkgs/applications/graphics/upscayl/default.nix index 87315bae2cac..d146919e556f 100644 --- a/pkgs/applications/graphics/upscayl/default.nix +++ b/pkgs/applications/graphics/upscayl/default.nix @@ -4,11 +4,11 @@ lib, }: let pname = "upscayl"; - version = "2.7.5"; + version = "2.8.1"; src = fetchurl { url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage"; - hash = "sha256-vJDpwf/N3rk5Bd9hBNpoNtlIAgn+Y77MF231ZOhLNeI="; + hash = "sha256-gmFT6onuoaw9WDCUDImZM/AxuZECqPC73ZyNnp6WSGA="; }; appimageContents = appimageTools.extractType2 { From 9e0439949a379e2a9a6fc7fda3402350befa26a5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Sep 2023 17:50:49 +0200 Subject: [PATCH 45/70] python311Packages.appthreat-vulnerability-db: 5.4.1 -> 5.4.2 Diff: https://github.com/AppThreat/vulnerability-db/compare/refs/tags/v5.4.1...v5.4.2 Changelog: https://github.com/AppThreat/vulnerability-db/releases/tag/v5.4.2 --- .../python-modules/appthreat-vulnerability-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 793591627837..1e5cd61aff4f 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.4.1"; + version = "5.4.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-sfhcAEJn+9uTPZLjgurfpuWNEdefzQZSXZdw7IeuqZw="; + hash = "sha256-S0ebTM7X21Lny9Y1JG7ztv/H5gUjxXxNOQIIBTGFB7c="; }; postPatch = '' From 03d6f3538902af1aae6e8b953a76ccdf710befce Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Sep 2023 18:06:55 +0200 Subject: [PATCH 46/70] python311Packages.hahomematic: 2023.9.1 -> 2023.9.2 Diff: https://github.com/danielperna84/hahomematic/compare/refs/tags/2023.9.1...2023.9.2 Changelog: https://github.com/danielperna84/hahomematic/releases/tag/2023.9.2 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index b3ffdc65f4fb..d1ece49b47a6 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.9.1"; + version = "2023.9.2"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-EItguRqgf6oCKUPdW4cH5kGeZqn4Ke+7gVYhcYrhhjk="; + hash = "sha256-h8zSj1jmqaQtJl3lPYGj7kEBucK7DAOkdUcDo7Opy7w="; }; nativeBuildInputs = [ From f76717681dc50a9541cc889a67b3286c1103143a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Sep 2023 16:08:24 +0000 Subject: [PATCH 47/70] python311Packages.hsluv: 5.0.3 -> 5.0.4 Diff: https://github.com/hsluv/hsluv-python/compare/v5.0.3...v5.0.4 --- pkgs/development/python-modules/hsluv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hsluv/default.nix b/pkgs/development/python-modules/hsluv/default.nix index d7e1ef4612ee..27701da88914 100644 --- a/pkgs/development/python-modules/hsluv/default.nix +++ b/pkgs/development/python-modules/hsluv/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "hsluv"; - version = "5.0.3"; + version = "5.0.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "hsluv"; repo = "hsluv-python"; rev = "v${version}"; - hash = "sha256-p3KD+zhHCOs/rLUVf1IkW/isfpUPQstB2VHGmZ/aEPU="; + hash = "sha256-bjivmPTU3Gp3pcC0ru4GSZANdhPqS1QSTMeiPGN8GCI="; }; nativeCheckInputs = [ From 5570c265acd23ebcc09e67b3aef51e6c61251fb0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Sep 2023 16:12:58 +0000 Subject: [PATCH 48/70] python311Packages.aiolifx-themes: 0.4.8 -> 0.4.9 Diff: https://github.com/Djelibeybi/aiolifx-themes/compare/refs/tags/v0.4.8...v0.4.9 Changelog: https://github.com/Djelibeybi/aiolifx-themes/releases/tag/v0.4.9 --- pkgs/development/python-modules/aiolifx-themes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix index 618c0e0d9023..08015af0f7ad 100644 --- a/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiolifx-themes"; - version = "0.4.8"; + version = "0.4.9"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Djelibeybi"; repo = "aiolifx-themes"; rev = "refs/tags/v${version}"; - hash = "sha256-jbL6f6gDH6AxsfuD7mFtvCGKLqy/NKoo5bUmXN9hBrM="; + hash = "sha256-8t0yRia/grSSEqySV57QoB3lgU9iwqiVOvVLE5Jd2pM="; }; prePatch = '' From 839ff463f07d47a8e650eccb62ae00f1ef186e2f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Sep 2023 16:14:46 +0000 Subject: [PATCH 49/70] python311Packages.casbin: 1.27.0 -> 1.28.0 Diff: https://github.com/casbin/pycasbin/compare/refs/tags/v1.27.0...v1.28.0 Changelog: https://github.com/casbin/pycasbin/blob/v1.28.0/CHANGELOG.md --- pkgs/development/python-modules/casbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 1b6a7d72e415..eb825a5d9ad7 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.27.0"; + version = "1.28.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-gZgaWgkvMuD7IfIy85rX3i6lZqj5WkStF0dHe+AQSJY="; + hash = "sha256-h/wg7O6zWnSQL5+VzAUA+G/4i7LcFpHvK2weyql998Y="; }; propagatedBuildInputs = [ From 017a7431a5c79c09e308b12dd55677a5dbdac933 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Sep 2023 18:22:15 +0200 Subject: [PATCH 50/70] python311Packages.azure-storage-queue: 12.6.0 -> 12.7.1 Changelog: https://github.com/Azure/azure-sdk-for-python/blob/azure-storage-queue_12.7.1/sdk/storage/azure-storage-queue/CHANGELOG.md --- .../azure-storage-queue/default.nix | 34 ++++++++++++++----- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/azure-storage-queue/default.nix b/pkgs/development/python-modules/azure-storage-queue/default.nix index c98609a6df78..0990203d42dd 100644 --- a/pkgs/development/python-modules/azure-storage-queue/default.nix +++ b/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -1,33 +1,49 @@ { lib +, azure-core , buildPythonPackage +, cryptography , fetchPypi -, azure-common -, azure-storage-common -, msrest +, isodate +, pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "azure-storage-queue"; - version = "12.6.0"; + version = "12.7.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GaAfHYYLXll4nhcnzmrsTwkDrFYwelZMT6d3+zi2tQ0="; - extension = "zip"; + hash = "sha256-zBt5z13ZRxB1xMLA3xEWf7mSoil43JLl8q46w0n/avY="; }; propagatedBuildInputs = [ - azure-common - azure-storage-common - msrest + azure-core + cryptography + isodate + typing-extensions ]; + passthru.optional-dependencies = { + aio = [ + azure-core + ] ++ azure-core.optional-dependencies.aio; + }; + # has no tests doCheck = false; + pythonImportsCheck = [ + "azure.storage.queue" + ]; + meta = with lib; { description = "Client library for Microsoft Azure Storage services containing the queue service APIs"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-storage-queue_${version}/sdk/storage/azure-storage-queue/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ cmcdragonkai ]; }; From 642de1740b230bb57407b763480f825a84cc7ab1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Sep 2023 18:33:21 +0200 Subject: [PATCH 51/70] python311Packages.clevercsv: 0.8.0 -> 0.8.1 Diff: https://github.com/alan-turing-institute/CleverCSV/compare/refs/tags/v0.8.0...v0.8.1 Changelog: https://github.com/alan-turing-institute/CleverCSV/blob/refs/tags/v0.8.1/CHANGELOG.md --- pkgs/development/python-modules/clevercsv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix index 4ab05a964f56..6f7d682ba033 100644 --- a/pkgs/development/python-modules/clevercsv/default.nix +++ b/pkgs/development/python-modules/clevercsv/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "clevercsv"; - version = "0.8.0"; + version = "0.8.1"; format = "setuptools"; src = fetchFromGitHub { owner = "alan-turing-institute"; repo = "CleverCSV"; rev = "refs/tags/v${version}"; - hash = "sha256-/JveB6fpIJvR5byGcmO9XBuCbUw7yNTpSoDs68Wffmo="; + hash = "sha256-kCkMZnHbFUuBBvlQ5rn0tNeL7uTAq0aodpj2JvPo968="; }; propagatedBuildInputs = [ From bddaaf18f15bf38f032df4d807ebb63c6bc9e27a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Sep 2023 18:39:56 +0200 Subject: [PATCH 52/70] python311Packages.google-cloud-compute: 1.14.0 -> 1.14.1 Changelog: https://github.com/googleapis/python-compute/blob/v1.14.1/CHANGELOG.md --- .../python-modules/google-cloud-compute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-compute/default.nix b/pkgs/development/python-modules/google-cloud-compute/default.nix index 634c488fde42..b705224111ea 100644 --- a/pkgs/development/python-modules/google-cloud-compute/default.nix +++ b/pkgs/development/python-modules/google-cloud-compute/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-compute"; - version = "1.14.0"; + version = "1.14.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AtGjz+ghJ+/WI8ppavkF2J6Hqq65pQYhWb3PN0f9j2Y="; + hash = "sha256-rNmHZH18gmqpe0QYFBx0Dq1eiBHTNJMV8viaMMAcf0s="; }; propagatedBuildInputs = [ From 66212346b2fd83eeed7d57b347793183367f1f25 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Sep 2023 18:45:58 +0200 Subject: [PATCH 53/70] python311Packages.google-auth-httplib2: 0.1.0 -> 0.1.1 Changelog: https://github.com/googleapis/google-auth-library-python-httplib2/blob/v0.1.1/CHANGELOG.md --- .../python-modules/google-auth-httplib2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-auth-httplib2/default.nix b/pkgs/development/python-modules/google-auth-httplib2/default.nix index c35297f6b5cf..510b62c5bbae 100644 --- a/pkgs/development/python-modules/google-auth-httplib2/default.nix +++ b/pkgs/development/python-modules/google-auth-httplib2/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-auth-httplib2"; - version = "0.1.0"; + version = "0.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oHw5/WMr7KzT8HcY39YCG/OWl48DrTzkMh0GABXMMKw="; + hash = "sha256-xkvFVf3G3XiOpi7Pe8z/z0l793JEiHo/PXpaAvjj/Ck="; }; propagatedBuildInputs = [ From d9dda8f4ba7e148998db866a47302dca28334546 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Sep 2023 18:48:50 +0200 Subject: [PATCH 54/70] python311Packages.google-cloud-dataproc: 5.5.0 -> 5.5.1 Changelog: https://github.com/googleapis/python-dataproc/blob/v5.5.1/CHANGELOG.md --- .../python-modules/google-cloud-dataproc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 9732cfe2a6a1..70ad01460836 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.5.0"; + version = "5.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XYjEmBMCkCUxKvAF2KNXwG72C6TMszLikFvLtnjJf14="; + hash = "sha256-+tfaWdOR/sFfGih71x1VznI3gZ2quQ4h1rEUCFHZ1DQ="; }; propagatedBuildInputs = [ From 27ebcf326e531249c99337fdc756ecb8716d8bcc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Sep 2023 18:49:38 +0200 Subject: [PATCH 55/70] python311Packages.google-cloud-dlp: 3.12.2 -> 3.12.3 Changelog: https://github.com/googleapis/python-dlp/blob/v3.12.3/CHANGELOG.md --- pkgs/development/python-modules/google-cloud-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index c7e75a8e8af0..ddf8472ea795 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.12.2"; + version = "3.12.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+Ab1XD45m3PqQ0LHBIRVId5wARJ9KOjClEk9C2c2NBY="; + hash = "sha256-c4gPKov6YASVdvuU2FaYqiNn0yrJAbdieP5Qt1ZjRAs="; }; propagatedBuildInputs = [ From f975769295f7f71a4d549debd6995d30d08ee89b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 18 Sep 2023 18:57:39 +0200 Subject: [PATCH 56/70] python311Packages.ical: 5.0.1 -> 5.1.0 Diff: https://github.com/allenporter/ical/compare/refs/tags/5.0.1...5.1.0 Changelog: https://github.com/allenporter/ical/releases/tag/5.1.0 --- pkgs/development/python-modules/ical/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index da27462cc50b..c69df0352c2a 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "ical"; - version = "5.0.1"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6gMmY6XlFdqF0DxkrCJhZPzUYZuEpDnIHG++nBRE3hg="; + hash = "sha256-ffNgYtwErt9tzfDWQnt0h7QHQL+gMvFpP8zH6FSoHEM="; }; nativeBuildInputs = [ From af8dfc58f9e783eb0cbaa99c4ab13990c8c9b03f Mon Sep 17 00:00:00 2001 From: redshifttt Date: Mon, 18 Sep 2023 18:09:41 +0100 Subject: [PATCH 57/70] easyeffects: 7.0.5 -> 7.1.0 --- pkgs/applications/audio/easyeffects/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix index ac286d499f1a..648bcd67660e 100644 --- a/pkgs/applications/audio/easyeffects/default.nix +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -28,22 +28,22 @@ , rnnoise , rubberband , speexdsp +, soundtouch , tbb , wrapGAppsHook4 , zam-plugins , zita-convolver -, soundtouch }: stdenv.mkDerivation rec { pname = "easyeffects"; - version = "7.0.5"; + version = "7.1.0"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - hash = "sha256-Z/0O8dVZ3J901OdOc1wF1XibNE/33b8oSqY6RKPDfzg="; + hash = "sha256-TuVW2KBJciuFVdduzfFepGOa+UY9+sXRN1gWhfDvXgw="; }; nativeBuildInputs = [ From 73983b3d62d3a50b72a126b0c786b8e4af899e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Mon, 18 Sep 2023 20:23:57 +0200 Subject: [PATCH 58/70] eza: 0.12.0 -> 0.13.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christina Sørensen --- pkgs/tools/misc/eza/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/eza/default.nix b/pkgs/tools/misc/eza/default.nix index c8ea3fe2a751..47c4f40e4ead 100644 --- a/pkgs/tools/misc/eza/default.nix +++ b/pkgs/tools/misc/eza/default.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-vgjoDmWtLMP/dpBeydgBNZjSQRuvv0Fm/PcKKAIoIdc="; + hash = "sha256-EvNdE9SYO8+DEJoIxJEh3Fy/+AbtoAyUrOnZtd23K7Q="; }; - cargoHash = "sha256-L1i/1dqOXm97Wugc5ZazQiq3T3PFvMaWK7LpCshpxgw="; + cargoHash = "sha256-1QluALqSwu49/oz89m3KDDgGo91lqOj+WDP8erGmA/8="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] From 229e2253f2cde7baecbe267f1f33556b0ce71a93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Sep 2023 18:50:03 +0000 Subject: [PATCH 59/70] python310Packages.mkdocstrings-python: 1.6.3 -> 1.7.0 --- .../python-modules/mkdocstrings-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index 3bf71e64642d..3fc681de70ea 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.6.3"; + version = "1.7.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-jppuuzROhVqNHm44gITpnC+xSN4s3ueY00N9v+IoJfE="; + hash = "sha256-akN9/h7jh0SFY1GZ1YlwMw33/RmycekMs0nWpUHLu6Y="; }; nativeBuildInputs = [ From c5e032fda7deeecd1a3855a8c44a139f13c73d0b Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Mon, 18 Sep 2023 21:28:53 +0200 Subject: [PATCH 60/70] vectorscan: fix changelog url Vectorscan is a downstream fork for Hyperscan. Both are active. The Hyperscan changelog is kept unchanged in CHANGELOG.md, while the Vectorscan specific changes are tracked in a seperate file. --- pkgs/development/libraries/vectorscan/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/vectorscan/default.nix b/pkgs/development/libraries/vectorscan/default.nix index 03aec03ad656..d458579d63fb 100644 --- a/pkgs/development/libraries/vectorscan/default.nix +++ b/pkgs/development/libraries/vectorscan/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { code will be abstracted away. ''; homepage = "https://www.vectorcamp.gr/vectorscan/"; - changelog = "https://github.com/VectorCamp/vectorscan/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/VectorCamp/vectorscan/blob/${src.rev}/CHANGELOG-vectorscan.md"; platforms = platforms.unix; license = with licenses; [ bsd3 /* and */ bsd2 /* and */ licenses.boost ]; maintainers = with maintainers; [ tnias vlaci ]; From 8e0d97130a1cc0087f37f5c7308e38abfbc32d7a Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 18 Sep 2023 15:45:34 -0400 Subject: [PATCH 61/70] typos: 1.16.11 -> 1.16.12 Diff: https://github.com/crate-ci/typos/compare/v1.16.11...v1.16.12 Changelog: https://github.com/crate-ci/typos/blob/v1.16.12/CHANGELOG.md --- pkgs/development/tools/typos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index 9508f5daf134..f3752cb90a93 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.16.11"; + version = "1.16.12"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-6CinLQ3wdVG1Ry7nskbC4JlhwT9rlJiP1oc4ks1t7Ts="; + hash = "sha256-zi1SVEl+EZacPOEjpOIG9KiXY2790fO63gGyc2jKNoE="; }; - cargoHash = "sha256-S7cMbnelsUfP8t93jqv0PY50fN/XtkphKhiKfe2fE/c="; + cargoHash = "sha256-UQVERFAaGyrWIp+3fxZ0Bpbv7ZTPYQiTCRgaYnU8Zq0="; meta = with lib; { description = "Source code spell checker"; From ad07cd4fc2e37cdeca8f6b920f4d955fa280f595 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 18 Sep 2023 14:58:14 -0500 Subject: [PATCH 62/70] treewide: add version tests (#255781) --- pkgs/applications/file-managers/ranger/default.nix | 6 +++++- pkgs/applications/misc/1password/default.nix | 6 +++++- pkgs/development/tools/lazygit/default.nix | 6 +++++- pkgs/os-specific/darwin/sketchybar/default.nix | 6 ++++++ pkgs/os-specific/darwin/skhd/default.nix | 6 ++++++ pkgs/tools/misc/lazydocker/default.nix | 6 +++++- pkgs/tools/misc/ncdu/default.nix | 5 +++++ pkgs/tools/misc/toilet/default.nix | 6 +++++- pkgs/tools/system/bottom/default.nix | 6 ++++++ pkgs/tools/system/btop/default.nix | 6 ++++++ 10 files changed, 54 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/file-managers/ranger/default.nix b/pkgs/applications/file-managers/ranger/default.nix index 96d43dc8f247..4906a06123c8 100644 --- a/pkgs/applications/file-managers/ranger/default.nix +++ b/pkgs/applications/file-managers/ranger/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages, file, less, highlight, w3m +{ lib, fetchFromGitHub, python3Packages, file, less, highlight, w3m, ranger, testers , imagePreviewSupport ? true , neoVimSupport ? true , improvedEncodingDetection ? true @@ -49,6 +49,10 @@ python3Packages.buildPythonApplication rec { --replace "set preview_images false" "set preview_images true" ''; + passthru.tests.version = testers.testVersion { + package = ranger; + }; + meta = with lib; { description = "File manager with minimalistic curses interface"; homepage = "https://ranger.github.io/"; diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index d4dddd861f29..a4f0b957c991 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchzip, autoPatchelfHook, installShellFiles, cpio, xar }: +{ lib, stdenv, fetchurl, fetchzip, autoPatchelfHook, installShellFiles, cpio, xar, _1password, testers }: let inherit (stdenv.hostPlatform) system; @@ -63,6 +63,10 @@ stdenv.mkDerivation { $out/bin/${mainProgram} --version ''; + passthru.tests.version = testers.testVersion { + package = _1password; + }; + meta = with lib; { description = "1Password command-line tool"; homepage = "https://developer.1password.com/docs/cli/"; diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index a28d4774c12c..97233ab11582 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, lazygit, testers }: buildGoModule rec { pname = "lazygit"; @@ -16,6 +16,10 @@ buildGoModule rec { ldflags = [ "-X main.version=${version}" "-X main.buildSource=nix" ]; + passthru.tests.version = testers.testVersion { + package = lazygit; + }; + meta = with lib; { description = "Simple terminal UI for git commands"; homepage = "https://github.com/jesseduffield/lazygit"; diff --git a/pkgs/os-specific/darwin/sketchybar/default.nix b/pkgs/os-specific/darwin/sketchybar/default.nix index b2b4186b7eb8..069fac3d59f1 100644 --- a/pkgs/os-specific/darwin/sketchybar/default.nix +++ b/pkgs/os-specific/darwin/sketchybar/default.nix @@ -9,6 +9,7 @@ , IOKit , MediaRemote , SkyLight +, testers }: let @@ -53,6 +54,11 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + version = "sketchybar-v${finalAttrs.version}"; + }; + meta = { description = "A highly customizable macOS status bar replacement"; homepage = "https://github.com/FelixKratz/SketchyBar"; diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix index be70e1c8bcd7..fa6e1aa01e9f 100644 --- a/pkgs/os-specific/darwin/skhd/default.nix +++ b/pkgs/os-specific/darwin/skhd/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , Carbon , Cocoa +, testers }: stdenv.mkDerivation (finalAttrs: { @@ -31,6 +32,11 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace $out/Library/LaunchDaemons/org.nixos.skhd.plist --subst-var out ''; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + version = "skhd-v${finalAttrs.version}"; + }; + meta = { description = "Simple hotkey daemon for macOS"; homepage = "https://github.com/koekeishiya/skhd"; diff --git a/pkgs/tools/misc/lazydocker/default.nix b/pkgs/tools/misc/lazydocker/default.nix index 8c45351b385c..33ac06306558 100644 --- a/pkgs/tools/misc/lazydocker/default.nix +++ b/pkgs/tools/misc/lazydocker/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, lazydocker, testers }: buildGoModule rec { pname = "lazydocker"; @@ -21,6 +21,10 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + passthru.tests.version = testers.testVersion { + package = lazydocker; + }; + meta = with lib; { description = "A simple terminal UI for both docker and docker-compose"; homepage = "https://github.com/jesseduffield/lazydocker"; diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 264753464500..47a1365b5367 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -4,6 +4,7 @@ , ncurses , zig_0_11 , installShellFiles +, testers , pie ? stdenv.isDarwin }: @@ -31,6 +32,10 @@ stdenv.mkDerivation (finalAttrs: { installManPage ncdu.1 ''; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + meta = { homepage = "https://dev.yorhel.nl/ncdu"; description = "Disk usage analyzer with an ncurses interface"; diff --git a/pkgs/tools/misc/toilet/default.nix b/pkgs/tools/misc/toilet/default.nix index 41eaa6b03bf5..d67383e4d521 100644 --- a/pkgs/tools/misc/toilet/default.nix +++ b/pkgs/tools/misc/toilet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libcaca }: +{ lib, stdenv, fetchurl, pkg-config, libcaca, toilet, testers }: stdenv.mkDerivation rec { pname = "toilet"; @@ -12,6 +12,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libcaca ]; + passthru.tests.version = testers.testVersion { + package = toilet; + }; + meta = with lib; { description = "Display large colourful characters in text mode"; homepage = "http://caca.zoy.org/wiki/toilet"; diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix index 223d4b0f2c96..dfc1ffcd112c 100644 --- a/pkgs/tools/system/bottom/default.nix +++ b/pkgs/tools/system/bottom/default.nix @@ -4,6 +4,8 @@ , installShellFiles , stdenv , darwin +, bottom +, testers }: rustPlatform.buildRustPackage rec { @@ -36,6 +38,10 @@ rustPlatform.buildRustPackage rec { BTM_GENERATE = true; + passthru.tests.version = testers.testVersion { + package = bottom; + }; + meta = with lib; { description = "A cross-platform graphical process/system monitor with a customizable interface"; homepage = "https://github.com/ClementTsang/bottom"; diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index b74089ae0a9a..a4a5156525dd 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , darwin , removeReferencesTo +, btop +, testers }: stdenv.mkDerivation rec { @@ -30,6 +32,10 @@ stdenv.mkDerivation rec { ${removeReferencesTo}/bin/remove-references-to -t ${stdenv.cc.cc} $(readlink -f $out/bin/btop) ''; + passthru.tests.version = testers.testVersion { + package = btop; + }; + meta = with lib; { description = "A monitor of resources"; homepage = "https://github.com/aristocratos/btop"; From 8e11eef3146ae19873ee9ff4e7590a0250fdee15 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 18 Sep 2023 10:33:38 -0400 Subject: [PATCH 63/70] python311Packages.onnx: protobuf 3.x -> 4.x --- pkgs/development/python-modules/onnx/default.nix | 9 +++++++++ pkgs/top-level/python-packages.nix | 7 ++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index 0f9b290cc28d..4d4b587314d3 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -13,6 +13,7 @@ , pythonOlder , tabulate , typing-extensions +, abseil-cpp }: let @@ -36,6 +37,10 @@ in buildPythonPackage rec { pybind11 ]; + buildInputs = [ + abseil-cpp + ]; + propagatedBuildInputs = [ protobuf numpy @@ -61,6 +66,10 @@ in buildPythonPackage rec { --replace 'include(googletest)' "" substituteInPlace cmake/unittest.cmake \ --replace 'googletest)' ')' + + # remove this override in 1.15 that will enable to set the CMAKE_CXX_STANDARD with cmakeFlags + substituteInPlace CMakeLists.txt \ + --replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 17' ''; preConfigure = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9bf338fb5f9c..cd10caec3cd3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7518,7 +7518,12 @@ self: super: with self; { onlykey-solo-python = callPackage ../development/python-modules/onlykey-solo-python { }; onnx = callPackage ../development/python-modules/onnx { - protobuf = protobuf3; + # in linux c++ defaults to 17 + # on darwin clang is on an old version so c++ defaults to 11 + abseil-cpp = if stdenv.isLinux then + pkgs.abseil-cpp_202301 + else + pkgs.abseil-cpp_202301.override { cxxStandard = "17"; }; }; onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common { From 057cd2a739428b4c7b5168f1f39a67bc9f3d44e1 Mon Sep 17 00:00:00 2001 From: gbtb Date: Tue, 19 Sep 2023 00:38:02 +1000 Subject: [PATCH 64/70] rocketchat-desktop: 3.8.11 -> 3.9.7 --- .../instant-messengers/rocketchat-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index 95bd9de69ee3..6bee6f1476a2 100644 --- a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -4,11 +4,11 @@ let in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "3.8.11"; + version = "3.9.7"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb"; - sha256 = "sha256-gRMoLzCAXByLVtzYAZnhmbgbfsav6CkbP3ZE0NDdlMw="; + hash = "sha256-DxY8cXWHBboH6Uh2i9DSJ2F8/OaGTRlIEaLzhQpXnKk="; }; nativeBuildInputs = [ From 9867c0da21def5493993c5f84946266222443608 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 18 Sep 2023 22:21:55 +0200 Subject: [PATCH 65/70] python310Packages.objax: switch back to GitHub for sources --- .../python-modules/objax/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/objax/default.nix b/pkgs/development/python-modules/objax/default.nix index c5045a771f59..548039d63b32 100644 --- a/pkgs/development/python-modules/objax/default.nix +++ b/pkgs/development/python-modules/objax/default.nix @@ -1,5 +1,5 @@ { lib -, fetchPypi +, fetchFromGitHub , buildPythonPackage , jax , jaxlib @@ -14,17 +14,11 @@ buildPythonPackage rec { pname = "objax"; version = "1.7.0"; - # The latest release (1.7.0) has not been tagged on GitHub. Thus, we fallback to fetchPypi. - # An issue has been opened upstream: https://github.com/google/objax/issues/263 - # src = fetchFromGitHub { - # owner = "google"; - # repo = "objax"; - # rev = "v${version}"; - # hash = ""; - # }; - src = fetchPypi { - inherit pname version; - hash = "sha256-92Z5RxYoWkMAqyF7H/MagPnC4pfXks5k9zmjvo+Z2Mc="; + src = fetchFromGitHub { + owner = "google"; + repo = "objax"; + rev = "v${version}"; + hash = "sha256-1/XmxFZfU+XMD0Mlcv4xTUYZDwltAx1bZOlPuKWQQC0="; }; # Avoid propagating the dependency on `jaxlib`, see From b703fb03614010cd1feb529cb1acd80045bacd48 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Wed, 14 Dec 2022 12:32:49 +0100 Subject: [PATCH 66/70] geos: add package tests --- pkgs/development/libraries/geos/default.nix | 11 ++++++++--- pkgs/development/libraries/geos/tests.nix | 15 +++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/geos/tests.nix diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index 5c2369cf4410..1f3ce471dc0e 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,8 +1,10 @@ { lib -, fetchurl -, fetchpatch , stdenv +, callPackage +, fetchpatch +, fetchurl , testers + , cmake }: @@ -29,7 +31,10 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + passthru.tests = { + pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; + geos = callPackage ./tests.nix { geos = finalAttrs.finalPackage; }; + }; meta = with lib; { description = "C/C++ library for computational geometry with a focus on algorithms used in geographic information systems (GIS) software"; diff --git a/pkgs/development/libraries/geos/tests.nix b/pkgs/development/libraries/geos/tests.nix new file mode 100644 index 000000000000..0f11885ab78c --- /dev/null +++ b/pkgs/development/libraries/geos/tests.nix @@ -0,0 +1,15 @@ +{ runCommand, geos }: + +let + inherit (geos) pname; +in +runCommand "${geos}-tests" { meta.timeout = 60; } + '' + ${geos}/bin/geosop \ + --explode \ + --format wkt \ + polygonize \ + -a "MULTILINESTRING ((200 100, 100 100, 200 200), (200 200, 200 100), (200 200, 300 100, 200 100))" \ + | grep 'POLYGON ((200 100, 100 100, 200 200, 200 100))' + touch $out + '' From a11c1555527f64f9ff34a0af0abae5044e47be69 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Mon, 18 Sep 2023 14:25:36 +0000 Subject: [PATCH 67/70] python3Packages.torch: add descriptive messages when marked broken --- .../python-modules/torch/default.nix | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 1fa790686cac..f9f6e377b139 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -51,7 +51,7 @@ }: let - inherit (lib) lists strings trivial; + inherit (lib) attrsets lists strings trivial; inherit (cudaPackages) cudaFlags cudnn nccl; setBool = v: if v then "1" else "0"; @@ -105,6 +105,14 @@ let rocm-runtime rocm-opencl-runtime hipify ]; }; + + brokenConditions = attrsets.filterAttrs (_: cond: cond) { + "CUDA and ROCm are not mutually exclusive" = cudaSupport && rocmSupport; + "CUDA is not targeting Linux" = cudaSupport && !stdenv.isLinux; + "Unsupported CUDA version" = cudaSupport && (cudaPackages.cudaMajorVersion != "11"); + "MPI cudatoolkit does not match cudaPackages.cudatoolkit" = MPISupport && cudaSupport && (mpi.cudatoolkit != cudaPackages.cudatoolkit); + "Magma cudaPackages does not match cudaPackages" = cudaSupport && (magma.cudaPackages != cudaPackages); + }; in buildPythonPackage rec { pname = "torch"; # Don't forget to update torch-bin to the same version. @@ -426,6 +434,8 @@ in buildPythonPackage rec { inherit cudaSupport cudaPackages; # At least for 1.10.2 `torch.fft` is unavailable unless BLAS provider is MKL. This attribute allows for easy detection of its availability. blasProvider = blas.provider; + # To help debug when a package is broken due to CUDA support + inherit brokenConditions; } // lib.optionalAttrs cudaSupport { # NOTE: supportedCudaCapabilities isn't computed unless cudaSupport is true, so we can't use # it in the passthru set above because a downstream package might try to access it even @@ -441,17 +451,6 @@ in buildPythonPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ teh thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds platforms = with platforms; linux ++ lib.optionals (!cudaSupport && !rocmSupport) darwin; - broken = builtins.any trivial.id [ - # CUDA and ROCm are mutually exclusive - (cudaSupport && rocmSupport) - # CUDA is only supported on Linux - (cudaSupport && !stdenv.isLinux) - # Only CUDA 11 is currently supported - (cudaSupport && (cudaPackages.cudaMajorVersion != "11")) - # MPI cudatoolkit does not match cudaPackages.cudatoolkit - (MPISupport && cudaSupport && (mpi.cudatoolkit != cudaPackages.cudatoolkit)) - # Magma cudaPackages does not match cudaPackages - (cudaSupport && (magma.cudaPackages != cudaPackages)) - ]; + broken = builtins.any trivial.id (builtins.attrValues brokenConditions); }; } From d30d4b9ca3f058121252e3e9149befdcba98dd5a Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 18 Sep 2023 16:03:33 -0400 Subject: [PATCH 68/70] spacer: 0.2 -> 0.3.0 Diff: https://github.com/samwho/spacer/compare/v0.2...v0.3.0 Changelog: https://github.com/samwho/spacer/releases/tag/v0.3.0 --- pkgs/tools/misc/spacer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/spacer/default.nix b/pkgs/tools/misc/spacer/default.nix index 4452b72ba836..0101b581f6a7 100644 --- a/pkgs/tools/misc/spacer/default.nix +++ b/pkgs/tools/misc/spacer/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "spacer"; - version = "0.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "samwho"; repo = "spacer"; rev = "v${version}"; - hash = "sha256-6RGwOyp/TzO7Z2xpcNFtAb+UaiMmgiuac9nqZs4fC10="; + hash = "sha256-gxqUMtONjYPjSmxyguE9/GBC91PUK1rdFGsISGaSe44="; }; - cargoHash = "sha256-XWXrivx0TJZmu5jJYJAzKm6dzqOwiWwU8mRuehZkQbA="; + cargoHash = "sha256-pMYqIl0Td2awAxe3BRglBcOychwTmFZ+pZV0QOT0CL4="; meta = with lib; { description = "CLI tool to insert spacers when command output stops"; From d102d7c2ec58eb9d101def4336ad72968d7a550e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 18 Sep 2023 15:25:11 +0200 Subject: [PATCH 69/70] python3.pkgs.deploykit: 1.1.0 -> 1.1.1 Diff: https://github.com/numtide/deploykit/compare/1.1.0...1.1.1 Changelog: https://github.com/numtide/deploykit/releases/tag/1.1.1 --- pkgs/development/python-modules/deploykit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deploykit/default.nix b/pkgs/development/python-modules/deploykit/default.nix index 2d1636818021..9668ec25c359 100644 --- a/pkgs/development/python-modules/deploykit/default.nix +++ b/pkgs/development/python-modules/deploykit/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "deploykit"; - version = "1.1.0"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "numtide"; repo = pname; rev = version; - hash = "sha256-re7r2K9F5FTTVn84WC+wZX30JA9AXQcHK3pLjYglMs8="; + hash = "sha256-7PiXq1bQJ1jswLHNqCDSYZabgfp8HRuRt5YPGzd5Ej0="; }; buildInputs = [ From c54fc2a40f7807bb7ef23c548202cfef10ffda3f Mon Sep 17 00:00:00 2001 From: Andrew Kvalheim Date: Thu, 14 Sep 2023 12:14:38 -0700 Subject: [PATCH 70/70] gpsprune: add media type associations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Allows selection of GpsPrune in GNOME’s “Open With…” menu. --- pkgs/applications/misc/gpsprune/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index dd76fe87550a..7b59df8fd4cf 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -17,12 +17,17 @@ stdenv.mkDerivation rec { desktopItems = [ (makeDesktopItem { name = "gpsprune"; - exec = "gpsprune"; + exec = "gpsprune %F"; icon = "gpsprune"; desktopName = "GpsPrune"; genericName = "GPS Data Editor"; comment = meta.description; categories = [ "Education" "Geoscience" ]; + mimeTypes = [ + "application/gpx+xml" + "application/vnd.google-earth.kml+xml" + "application/vnd.google-earth.kmz" + ]; }) ];