From f3d063820018405efbf3806dfd133f2264e83f3d Mon Sep 17 00:00:00 2001 From: Locochoco Date: Mon, 11 Mar 2024 16:38:55 -0300 Subject: [PATCH 01/94] basalt-monado: init at 0-unstable-2024-06-21 --- pkgs/by-name/ba/basalt-monado/package.nix | 78 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++ 2 files changed, 84 insertions(+) create mode 100644 pkgs/by-name/ba/basalt-monado/package.nix diff --git a/pkgs/by-name/ba/basalt-monado/package.nix b/pkgs/by-name/ba/basalt-monado/package.nix new file mode 100644 index 000000000000..cc031c9aa7b5 --- /dev/null +++ b/pkgs/by-name/ba/basalt-monado/package.nix @@ -0,0 +1,78 @@ +{ + autoPatchelfHook, + boost, + bzip2, + cereal, + cmake, + eigen, + extra-cmake-modules, + fetchFromGitLab, + fmt, + freeglut, + glew, + lib, + libepoxy, + libGL, + lz4, + magic-enum, + nix-update-script, + opencv, + pkg-config, + stdenv, + tbb, + xorg, +}: +stdenv.mkDerivation { + pname = "basalt-monado"; + version = "0-unstable-2024-06-21"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "mateosss"; + repo = "basalt"; + rev = "385c161f35720df3a6c606054565f9d49a1c5787"; + hash = "sha256-+2/pc2OWDwE04xPcfHL5GGyhQ1ZTN6o7cCNAilDgd2Y="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + autoPatchelfHook + cmake + extra-cmake-modules + pkg-config + ]; + + buildInputs = [ + boost + bzip2 + cereal + eigen + fmt + freeglut + glew + libepoxy + libGL + lz4 + magic-enum + opencv + tbb + xorg.libX11 + ]; + + cmakeFlags = [ + (lib.cmakeBool "BASALT_INSTANTIATIONS_DOUBLE" false) + (lib.cmakeBool "BUILD_TESTS" false) + (lib.cmakeFeature "EIGEN_ROOT" "${eigen}/include/eigen3") + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A fork of Basalt improved for tracking XR devices with Monado"; + homepage = "https://gitlab.freedesktop.org/mateosss/basalt"; + license = lib.licenses.bsd3; + mainProgram = "basalt_vio"; + maintainers = [ lib.maintainers.locochoco ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e871887f3ec..fd43b2fa8d8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -326,6 +326,12 @@ with pkgs; banana-accounting = callPackage ../applications/office/banana-accounting { }; + basalt-monado = callPackage ../by-name/ba/basalt-monado/package.nix { + tbb = tbb_2021_11; + cereal = cereal_1_3_2; + opencv = opencv.override { enableGtk3 = true; }; + }; + beebeep = libsForQt5.callPackage ../applications/office/beebeep { }; beeper = callPackage ../applications/networking/instant-messengers/beeper { }; From f2095203e66f1cf4d2fefcac4281ff9da5315a89 Mon Sep 17 00:00:00 2001 From: Heinz Deinhart Date: Sun, 6 Oct 2024 20:23:15 +0200 Subject: [PATCH 02/94] ddnet: 18.4 -> 18.6 https://ddnet.org/downloads/#18.6 https://github.com/ddnet/ddnet/compare/18.4...18.6 --- pkgs/games/ddnet/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 7356e9395d76..f899cdf8ddc1 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -36,19 +36,19 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "18.4"; + version = "18.6"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - hash = "sha256-BoEFh0lCd2pCIod5sFafnOs/TQHj/SlIAU8P4o+cjyE="; + hash = "sha256-thAB7QtR23j39ORK1YT2Idp4J7GffbNV7snbLAnYzMI="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; - hash = "sha256-1MJ5cP4lyRSZ7VRED8RL5scnqpcy8/avmBKW1Zmt6FU="; + hash = "sha256-/kCsAZP9cwUQFcNnk5/eYMzw80Bh4JnwPXd299p1JEU="; }; nativeBuildInputs = [ @@ -92,12 +92,12 @@ stdenv.mkDerivation rec { Security ]); - patches = [ - (fetchpatch { - url = "https://github.com/ddnet/ddnet/pull/8517/commits/c840bf45016a30e629f7684df5fab5d07b2c70d5.patch"; - hash = "sha256-UG7pi0Xh/nAHFEF1RIyNZLewF+NFilTLARbV5oUlftc="; - }) - ]; +# patches = [ +# (fetchpatch { +# url = "https://github.com/ddnet/ddnet/pull/8517/commits/c840bf45016a30e629f7684df5fab5d07b2c70d5.patch"; +# hash = "sha256-UG7pi0Xh/nAHFEF1RIyNZLewF+NFilTLARbV5oUlftc="; +# }) +# ]; postPatch = '' substituteInPlace src/engine/shared/storage.cpp \ From 7e45a0e6d86d06548d69489d20b702b28979dbd9 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Fri, 18 Oct 2024 12:00:58 +0200 Subject: [PATCH 03/94] uiua: add webcamSupport option --- pkgs/by-name/ui/uiua/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix index 5bcf16fdd8aa..19dbe22d987f 100644 --- a/pkgs/by-name/ui/uiua/package.nix +++ b/pkgs/by-name/ui/uiua/package.nix @@ -4,9 +4,11 @@ rustPlatform, fetchFromGitHub, pkg-config, - audioSupport ? true, + darwin, + audioSupport ? true, alsa-lib, + webcamSupport ? false, # passthru.tests.run runCommand, @@ -30,7 +32,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-4XHKcmOeaeSGfl7uvQQdhm29DBWEdZLX021d9+Ebrww="; nativeBuildInputs = - lib.optionals stdenv.hostPlatform.isDarwin [ rustPlatform.bindgenHook ] + lib.optionals (webcamSupport || stdenv.hostPlatform.isDarwin) [ rustPlatform.bindgenHook ] ++ lib.optionals audioSupport [ pkg-config ]; buildInputs = @@ -41,7 +43,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals (audioSupport && stdenv.hostPlatform.isDarwin) [ AudioUnit ] ++ lib.optionals (audioSupport && stdenv.hostPlatform.isLinux) [ alsa-lib ]; - buildFeatures = lib.optional audioSupport "audio"; + buildFeatures = lib.optional audioSupport "audio" ++ lib.optional webcamSupport "webcam"; passthru.updateScript = ./update.sh; passthru.tests.run = runCommand "uiua-test-run" { nativeBuildInputs = [ uiua ]; } '' From e87d07a533c368653802762555a9879759b21640 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Thu, 17 Oct 2024 22:34:15 +0200 Subject: [PATCH 04/94] linux_xanmod: 6.6.56 -> 6.6.57 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index d2e86f876c65..dd021eb0475a 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -7,8 +7,8 @@ let # kernel config in the xanmod version commit variants = { lts = { - version = "6.6.56"; - hash = "sha256-5EgCIMS6eZWPB8t6z6ts5sSHoeawja0diWuh/DNnvqw="; + version = "6.6.57"; + hash = "sha256-M12AgmaxfiBaKrZkONk7wNIJznbBhe0k1fNPIzA3ZI0="; }; main = { version = "6.11.3"; From 8b38a2bc3c4d66008f7fc3fd81b1c5f26b656052 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Thu, 17 Oct 2024 22:34:26 +0200 Subject: [PATCH 05/94] linux_xanmod_latest: 6.11.3 -> 6.11.4 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index dd021eb0475a..a369ced84c3c 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -11,8 +11,8 @@ let hash = "sha256-M12AgmaxfiBaKrZkONk7wNIJznbBhe0k1fNPIzA3ZI0="; }; main = { - version = "6.11.3"; - hash = "sha256-Pb/7XToBFZstI1DFgWg4a2HiRuSzA9rEsMBLb6fRvYc="; + version = "6.11.4"; + hash = "sha256-wBNC3V69CbWxdNckaHCRmm0GUe5EhH//SoDvDEq48ic="; }; }; From 2e4867bddf4f75a09ddb75f8af7bf9af070477ea Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sat, 19 Oct 2024 03:48:30 +0000 Subject: [PATCH 06/94] ovn: 24.09.0 -> 24.09.1 --- pkgs/by-name/ov/ovn/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ov/ovn/package.nix b/pkgs/by-name/ov/ovn/package.nix index e9c53a53e203..6f501da7d319 100644 --- a/pkgs/by-name/ov/ovn/package.nix +++ b/pkgs/by-name/ov/ovn/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "ovn"; - version = "24.09.0"; + version = "24.09.1"; src = fetchFromGitHub { owner = "ovn-org"; repo = "ovn"; rev = "refs/tags/v${version}"; - hash = "sha256-0KXr9oxZqIhPD0HIkDUECCjfEK50JkkJxx8xsZIoAnc="; + hash = "sha256-Fz/YNEbMZ2mB4Fv1nKE3H3XrihehYP7j0N3clnTJ5x8="; fetchSubmodules = true; }; From 98b70abd0b12662a2ff64ddc2beec9b6f924d6a4 Mon Sep 17 00:00:00 2001 From: dr56ekgbb Date: Sun, 20 Oct 2024 00:32:26 +0800 Subject: [PATCH 07/94] waveterm: 0.8.10 -> 0.8.12 --- pkgs/by-name/wa/waveterm/package.nix | 10 +++++----- pkgs/by-name/wa/waveterm/update.sh | 5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix index 9d13d24abdc8..7f762178a93c 100644 --- a/pkgs/by-name/wa/waveterm/package.nix +++ b/pkgs/by-name/wa/waveterm/package.nix @@ -33,7 +33,7 @@ let pname = "waveterm"; - version = "0.8.10"; + version = "0.8.12"; src = let @@ -46,10 +46,10 @@ let aarch64-darwin = "Wave-darwin-arm64-${version}.zip"; }; hash = selectSystem { - x86_64-linux = "sha256-jhXHuzHMwo9U5B+FA2xAreOYRVroMCXqDo+9pjAyh0Q="; - aarch64-linux = "sha256-JnKkjG67uvYNod+uosJ+svTAm9bulJzTpza3jQie1yQ="; - x86_64-darwin = "sha256-Dk/pKZrqkjKc7WEGkrLdZdgUEaz8ndXjZuINyVNxEa8="; - aarch64-darwin = "sha256-FgBbUrp+Z9K4gmM4mew0NQ2yIjuC+cgYrrYkjv0Ohhg="; + x86_64-linux = "sha256-lk+YBlsgS2kOsaesKJ0XMCnbxq5iza/0xG6qWjHLZA8="; + aarch64-linux = "sha256-57j5qp/1jGiqJP6Qmfw5XkoyXkNpnaTepfhSzlISExM="; + x86_64-darwin = "sha256-jBFkBC4PcWSQNw8A2w+2iUnSLoRvXQ3A0CVqkqfx4dI="; + aarch64-darwin = "sha256-pQ3TXKhiCI164qmmDkDFb3WUjd/lX1MnAOWqsQICHR4="; }; in fetchurl { diff --git a/pkgs/by-name/wa/waveterm/update.sh b/pkgs/by-name/wa/waveterm/update.sh index 7950a65e8dfa..d56927f60bb0 100755 --- a/pkgs/by-name/wa/waveterm/update.sh +++ b/pkgs/by-name/wa/waveterm/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p bash curl coreutils jq common-updater-scripts +#!nix-shell -i bash -p bash nixVersions.latest curl coreutils jq common-updater-scripts latestTag=$(curl https://api.github.com/repos/wavetermdev/waveterm/releases/latest | jq -r ".tag_name") latestVersion="$(expr "$latestTag" : 'v\(.*\)')" @@ -19,7 +19,6 @@ for i in \ "aarch64-darwin Wave-darwin-arm64"; do set -- $i prefetch=$(nix-prefetch-url "https://github.com/wavetermdev/waveterm/releases/download/v$latestVersion/$2-$latestVersion.zip") - hash=$(nix-hash --type sha256 --to-sri $prefetch) - + hash=$(nix hash convert --hash-algo sha256 --to sri $prefetch) update-source-version waveterm $latestVersion $hash --system=$1 --ignore-same-version done From e656ac409b8e8ea58f27f5c009c0a1358c6bba86 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Oct 2024 11:17:16 +0200 Subject: [PATCH 08/94] graphpython: init at 1.0-unstable-2024-07-28 Microsoft Graph API (Entra, o365, and Intune) enumeration and exploitation toolkit https://github.com/mlcsec/Graphpython --- pkgs/by-name/gr/graphpython/package.nix | 45 +++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/gr/graphpython/package.nix diff --git a/pkgs/by-name/gr/graphpython/package.nix b/pkgs/by-name/gr/graphpython/package.nix new file mode 100644 index 000000000000..f9c583d48745 --- /dev/null +++ b/pkgs/by-name/gr/graphpython/package.nix @@ -0,0 +1,45 @@ +{ + lib, + fetchFromGitHub, + python3, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "graphpython"; + version = "1.0-unstable-2024-07-28"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mlcsec"; + repo = "Graphpython"; + # https://github.com/mlcsec/Graphpython/issues/1 + rev = "ee7dbda7fe881a9a207ca8661d42c505b8491ea3"; + hash = "sha256-64M/Cc49mlceY5roBVuSsDIcbDx+lrX6oSjPAu9YDwA="; + }; + + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ + beautifulsoup4 + cryptography + dnspython + pyjwt + requests + tabulate + termcolor + tqdm + ]; + + pythonImportsCheck = [ "Graphpython" ]; + + # Project has no tests + doCheck = false; + + meta = { + description = "Microsoft Graph API (Entra, o365, and Intune) enumeration and exploitation toolkit"; + homepage = "https://github.com/mlcsec/Graphpython"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "graphpython"; + }; +} From 34395aeb9f0e88c44443c7d5040b23d73d6ef871 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 21 Oct 2024 11:50:55 +0200 Subject: [PATCH 09/94] python312Packages.torch-geometric: skip failing test on darwin --- .../torch-geometric/default.nix | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/torch-geometric/default.nix b/pkgs/development/python-modules/torch-geometric/default.nix index ed3bbdc73569..80286ff1a950 100644 --- a/pkgs/development/python-modules/torch-geometric/default.nix +++ b/pkgs/development/python-modules/torch-geometric/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -153,21 +154,27 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - disabledTests = [ - # TODO: try to re-enable when triton will have been updated to 3.0 - # torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised: - # LoweringException: ImportError: cannot import name 'triton_key' from 'triton.compiler.compiler' - "test_compile_hetero_conv_graph_breaks" - "test_compile_multi_aggr_sage_conv" + disabledTests = + [ + # TODO: try to re-enable when triton will have been updated to 3.0 + # torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised: + # LoweringException: ImportError: cannot import name 'triton_key' from 'triton.compiler.compiler' + "test_compile_hetero_conv_graph_breaks" + "test_compile_multi_aggr_sage_conv" - # RuntimeError: addmm: computation on CPU is not implemented for SparseCsr + SparseCsr @ SparseCsr without MKL. - # PyTorch built with MKL has better support for addmm with sparse CPU tensors. - "test_asap" - "test_graph_unet" + # RuntimeError: addmm: computation on CPU is not implemented for SparseCsr + SparseCsr @ SparseCsr without MKL. + # PyTorch built with MKL has better support for addmm with sparse CPU tensors. + "test_asap" + "test_graph_unet" - # AttributeError: type object 'Any' has no attribute '_name' - "test_type_repr" - ]; + # AttributeError: type object 'Any' has no attribute '_name' + "test_type_repr" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # This test uses `torch.jit` which might not be working on darwin: + # RuntimeError: required keyword attribute 'value' has the wrong type + "test_traceable_my_conv_with_self_loops" + ]; meta = { description = "Graph Neural Network Library for PyTorch"; From 12baf0a297387ebf78f257fcd00e83cf94f4c13f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Oct 2024 11:12:06 +0000 Subject: [PATCH 10/94] labwc-tweaks-gtk: 0-unstable-2024-09-30 -> 0-unstable-2024-10-20 --- pkgs/by-name/la/labwc-tweaks-gtk/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix index 59e3da8c08d1..fdf4420f1a81 100644 --- a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix +++ b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "labwc-tweaks-gtk"; - version = "0-unstable-2024-09-30"; + version = "0-unstable-2024-10-20"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc-tweaks-gtk"; - rev = "19ae222b6bab778d0f8a900d39c25ab020e33631"; - hash = "sha256-coA8gU2AKeHs6OENxBWholk5sEL/oketxNFLd8M1kTM="; + rev = "c3f83aabb6dca20fd3c2304db15da2e68d027d3e"; + hash = "sha256-1gzo9KMDHg5ZFMo5CpP36A5tomr2DFoU8UEwx7ik5F8="; }; nativeBuildInputs = [ From cdaedcb0ddd6c0fc00bb7c14d0257015fdb84ef9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 21 Oct 2024 12:31:10 +0000 Subject: [PATCH 11/94] xfce.mousepad: 0.6.2 -> 0.6.3 https://gitlab.xfce.org/apps/mousepad/-/compare/mousepad-0.6.2...mousepad-0.6.3 --- .../xfce/applications/mousepad/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/xfce/applications/mousepad/default.nix b/pkgs/desktops/xfce/applications/mousepad/default.nix index a312c0040e99..3bb9389c1e25 100644 --- a/pkgs/desktops/xfce/applications/mousepad/default.nix +++ b/pkgs/desktops/xfce/applications/mousepad/default.nix @@ -1,6 +1,5 @@ { lib , mkXfceDerivation -, fetchpatch2 , gobject-introspection , glib , gtk3 @@ -15,19 +14,10 @@ mkXfceDerivation { category = "apps"; pname = "mousepad"; - version = "0.6.2"; + version = "0.6.3"; odd-unstable = false; - sha256 = "sha256-A4siNxbTf9ObJJg8inPuH7Lo4dckLbFljV6aPFQxRto="; - - patches = [ - # shortcuts-plugin: Fix shortcuts-editor include - # https://gitlab.xfce.org/apps/mousepad/-/merge_requests/131 - (fetchpatch2 { - url = "https://gitlab.xfce.org/apps/mousepad/-/commit/d2eb43ae4d692cc4753647111eb3deebfa26abbb.patch"; - hash = "sha256-Ldn0ZVmCzqG8lOkeaazkodEMip3lTm/lJEhfsL8TyT8="; - }) - ]; + sha256 = "sha256-L1txMS86lOEE9tOPTIOr1Gh4lwH7krnAeq4f3yS5kN0="; nativeBuildInputs = [ gobject-introspection ]; From f32ef08b48bf3faf504c57d1588139cf9fbf7ded Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 21 Oct 2024 20:40:28 +0800 Subject: [PATCH 12/94] gnome-commander: init at 1.18.1-unstable-2024-10-18 --- pkgs/by-name/gn/gnome-commander/package.nix | 78 +++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 pkgs/by-name/gn/gnome-commander/package.nix diff --git a/pkgs/by-name/gn/gnome-commander/package.nix b/pkgs/by-name/gn/gnome-commander/package.nix new file mode 100644 index 000000000000..4de7e5f1e051 --- /dev/null +++ b/pkgs/by-name/gn/gnome-commander/package.nix @@ -0,0 +1,78 @@ +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + pkg-config, + flex, + itstool, + rustPlatform, + rustc, + cargo, + wrapGAppsHook4, + desktop-file-utils, + exiv2, + libgsf, + taglib, + poppler, + samba, + gtest, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gnome-commander"; + version = "1.18.1-unstable-2024-10-18"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "gnome-commander"; + rev = "28dadb1ef9342bb1a5f9a65b1a5bf3bd80e3d30a"; + hash = "sha256-DxsZJht+PD3vY5vc1vzpRD8FHBPKcjK4qfke5nhvHS0="; + }; + + # hard-coded schema paths + postPatch = '' + substituteInPlace src/gnome-cmd-data.cc plugins/fileroller/file-roller-plugin.cc \ + --replace-fail \ + '/share/glib-2.0/schemas' \ + '/share/gsettings-schemas/${finalAttrs.finalPackage.name}/glib-2.0/schemas' + ''; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) pname version src; + hash = "sha256-Nx/e2H9NxCTj62xVDlKTpPdjlxAx2YAcQJh1kHByrd4="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + flex + itstool + rustPlatform.cargoSetupHook + rustc + cargo + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + exiv2 + libgsf + taglib + poppler + samba + gtest + ]; + + meta = { + description = "Fast and powerful twin-panel file manager for the Linux desktop"; + homepage = "https://gcmd.github.io"; + license = lib.licenses.gpl2Plus; + mainProgram = "gnome-commander"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +}) From 08eee7bd7ae2eb1278d08416740c709bd796f26c Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Mon, 21 Oct 2024 20:56:43 +0800 Subject: [PATCH 13/94] home-assistant-custom-components.*: make use of lib.packagesFromDirectoryRecursive So we don't need to manually maintain `pkgs/servers/home-assistant/custom-components/default.nix` anymore --- .../{default.nix => package.nix} | 0 .../alarmo/{default.nix => package.nix} | 0 .../auth-header/{default.nix => package.nix} | 0 .../average/{default.nix => package.nix} | 0 .../awtrix/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../bodymiscale/{default.nix => package.nix} | 0 .../custom-components/default.nix | 92 ------------------- .../dwd/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../emporia_vue/{default.nix => package.nix} | 0 .../epex_spot/{default.nix => package.nix} | 0 .../frigate/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../govee-lan/{default.nix => package.nix} | 0 .../gpio/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../indego/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../localtuya/{default.nix => package.nix} | 0 .../mass/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../midea_ac/{default.nix => package.nix} | 0 .../midea_ac_lan/{default.nix => package.nix} | 0 .../miele/{default.nix => package.nix} | 0 .../moonraker/{default.nix => package.nix} | 0 .../nest_protect/{default.nix => package.nix} | 0 .../ntfy/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../sensi/{default.nix => package.nix} | 0 .../smartir/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../solax_modbus/{default.nix => package.nix} | 0 .../solis-sensor/{default.nix => package.nix} | 0 .../somweb/{default.nix => package.nix} | 0 .../spook/{default.nix => package.nix} | 0 .../tuya_local/{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../{default.nix => package.nix} | 0 .../xiaomi_miot/{default.nix => package.nix} | 0 .../yassi/{default.nix => package.nix} | 0 pkgs/top-level/all-packages.nix | 8 +- 46 files changed, 4 insertions(+), 96 deletions(-) rename pkgs/servers/home-assistant/custom-components/adaptive_lighting/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/alarmo/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/auth-header/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/average/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/awtrix/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/better_thermostat/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/bodymiscale/{default.nix => package.nix} (100%) delete mode 100644 pkgs/servers/home-assistant/custom-components/default.nix rename pkgs/servers/home-assistant/custom-components/dwd/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/elevenlabs_tts/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/emporia_vue/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/epex_spot/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/frigate/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/garmin_connect/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/govee-lan/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/gpio/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/homematicip_local/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/indego/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/local_luftdaten/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/localtuya/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/mass/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/midea_ac/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/midea_ac_lan/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/miele/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/moonraker/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/nest_protect/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/ntfy/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/omnik_inverter/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/prometheus_sensor/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/samsungtv-smart/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/sensi/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/smartir/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/smartthinq-sensors/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/solax_modbus/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/solis-sensor/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/somweb/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/spook/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/tuya_local/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/volkswagencarnet/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/waste_collection_schedule/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/xiaomi_miot/{default.nix => package.nix} (100%) rename pkgs/servers/home-assistant/custom-components/yassi/{default.nix => package.nix} (100%) diff --git a/pkgs/servers/home-assistant/custom-components/adaptive_lighting/default.nix b/pkgs/servers/home-assistant/custom-components/adaptive_lighting/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/adaptive_lighting/default.nix rename to pkgs/servers/home-assistant/custom-components/adaptive_lighting/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/alarmo/default.nix b/pkgs/servers/home-assistant/custom-components/alarmo/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/alarmo/default.nix rename to pkgs/servers/home-assistant/custom-components/alarmo/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/auth-header/default.nix b/pkgs/servers/home-assistant/custom-components/auth-header/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/auth-header/default.nix rename to pkgs/servers/home-assistant/custom-components/auth-header/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/average/default.nix b/pkgs/servers/home-assistant/custom-components/average/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/average/default.nix rename to pkgs/servers/home-assistant/custom-components/average/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/awtrix/default.nix b/pkgs/servers/home-assistant/custom-components/awtrix/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/awtrix/default.nix rename to pkgs/servers/home-assistant/custom-components/awtrix/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/better_thermostat/default.nix b/pkgs/servers/home-assistant/custom-components/better_thermostat/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/better_thermostat/default.nix rename to pkgs/servers/home-assistant/custom-components/better_thermostat/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/bodymiscale/default.nix b/pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/bodymiscale/default.nix rename to pkgs/servers/home-assistant/custom-components/bodymiscale/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix deleted file mode 100644 index b2d958812b84..000000000000 --- a/pkgs/servers/home-assistant/custom-components/default.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ callPackage -}: - -{ - adaptive_lighting = callPackage ./adaptive_lighting {}; - - alarmo = callPackage ./alarmo {}; - - auth-header = callPackage ./auth-header {}; - - awtrix = callPackage ./awtrix {}; - - average = callPackage ./average {}; - - better_thermostat = callPackage ./better_thermostat {}; - - bodymiscale = callPackage ./bodymiscale { }; - - dwd = callPackage ./dwd { }; - - elevenlabs_tts = callPackage ./elevenlabs_tts {}; - - emporia_vue = callPackage ./emporia_vue {}; - - epex_spot = callPackage ./epex_spot {}; - - frigate = callPackage ./frigate {}; - - garmin_connect = callPackage ./garmin_connect {}; - - govee-lan = callPackage ./govee-lan {}; - - gpio = callPackage ./gpio {}; - - homematicip_local = callPackage ./homematicip_local { }; - - indego = callPackage ./indego { }; - - local_luftdaten = callPackage ./local_luftdaten { }; - - localtuya = callPackage ./localtuya {}; - - mass = callPackage ./mass { }; - - midea_ac = callPackage ./midea_ac { }; - - midea_ac_lan = callPackage ./midea_ac_lan {}; - - midea-air-appliances-lan = callPackage ./midea-air-appliances-lan {}; - - miele = callPackage ./miele {}; - - moonraker = callPackage ./moonraker {}; - - nest_protect = callPackage ./nest_protect {}; - - ntfy = callPackage ./ntfy {}; - - omnik_inverter = callPackage ./omnik_inverter {}; - - prometheus_sensor = callPackage ./prometheus_sensor {}; - - samsungtv-smart = callPackage ./samsungtv-smart {}; - - sensi = callPackage ./sensi {}; - - smartir = callPackage ./smartir {}; - - smartthinq-sensors = callPackage ./smartthinq-sensors {}; - - solax_modbus = callPackage ./solax_modbus {}; - - solis-sensor = callPackage ./solis-sensor {}; - - somweb = callPackage ./somweb {}; - - spook = callPackage ./spook {}; - - tuya_local = callPackage ./tuya_local {}; - - volkswagen_we_connect_id = callPackage ./volkswagen_we_connect_id { }; - - volkswagencarnet = callPackage ./volkswagencarnet { }; - - waste_collection_schedule = callPackage ./waste_collection_schedule {}; - - xiaomi_gateway3 = callPackage ./xiaomi_gateway3 {}; - - xiaomi_miot = callPackage ./xiaomi_miot {}; - - yassi = callPackage ./yassi {}; -} diff --git a/pkgs/servers/home-assistant/custom-components/dwd/default.nix b/pkgs/servers/home-assistant/custom-components/dwd/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/dwd/default.nix rename to pkgs/servers/home-assistant/custom-components/dwd/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/elevenlabs_tts/default.nix b/pkgs/servers/home-assistant/custom-components/elevenlabs_tts/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/elevenlabs_tts/default.nix rename to pkgs/servers/home-assistant/custom-components/elevenlabs_tts/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/emporia_vue/default.nix b/pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/emporia_vue/default.nix rename to pkgs/servers/home-assistant/custom-components/emporia_vue/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/epex_spot/default.nix b/pkgs/servers/home-assistant/custom-components/epex_spot/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/epex_spot/default.nix rename to pkgs/servers/home-assistant/custom-components/epex_spot/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/frigate/default.nix b/pkgs/servers/home-assistant/custom-components/frigate/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/frigate/default.nix rename to pkgs/servers/home-assistant/custom-components/frigate/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/garmin_connect/default.nix b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/garmin_connect/default.nix rename to pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/govee-lan/default.nix b/pkgs/servers/home-assistant/custom-components/govee-lan/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/govee-lan/default.nix rename to pkgs/servers/home-assistant/custom-components/govee-lan/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/gpio/default.nix b/pkgs/servers/home-assistant/custom-components/gpio/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/gpio/default.nix rename to pkgs/servers/home-assistant/custom-components/gpio/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/default.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/homematicip_local/default.nix rename to pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/indego/default.nix b/pkgs/servers/home-assistant/custom-components/indego/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/indego/default.nix rename to pkgs/servers/home-assistant/custom-components/indego/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/local_luftdaten/default.nix b/pkgs/servers/home-assistant/custom-components/local_luftdaten/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/local_luftdaten/default.nix rename to pkgs/servers/home-assistant/custom-components/local_luftdaten/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/localtuya/default.nix b/pkgs/servers/home-assistant/custom-components/localtuya/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/localtuya/default.nix rename to pkgs/servers/home-assistant/custom-components/localtuya/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/mass/default.nix b/pkgs/servers/home-assistant/custom-components/mass/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/mass/default.nix rename to pkgs/servers/home-assistant/custom-components/mass/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/default.nix b/pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/default.nix rename to pkgs/servers/home-assistant/custom-components/midea-air-appliances-lan/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac/default.nix b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/midea_ac/default.nix rename to pkgs/servers/home-assistant/custom-components/midea_ac/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac_lan/default.nix b/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/midea_ac_lan/default.nix rename to pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/miele/default.nix b/pkgs/servers/home-assistant/custom-components/miele/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/miele/default.nix rename to pkgs/servers/home-assistant/custom-components/miele/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/moonraker/default.nix b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/moonraker/default.nix rename to pkgs/servers/home-assistant/custom-components/moonraker/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/nest_protect/default.nix b/pkgs/servers/home-assistant/custom-components/nest_protect/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/nest_protect/default.nix rename to pkgs/servers/home-assistant/custom-components/nest_protect/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/ntfy/default.nix b/pkgs/servers/home-assistant/custom-components/ntfy/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/ntfy/default.nix rename to pkgs/servers/home-assistant/custom-components/ntfy/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/omnik_inverter/default.nix b/pkgs/servers/home-assistant/custom-components/omnik_inverter/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/omnik_inverter/default.nix rename to pkgs/servers/home-assistant/custom-components/omnik_inverter/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/prometheus_sensor/default.nix b/pkgs/servers/home-assistant/custom-components/prometheus_sensor/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/prometheus_sensor/default.nix rename to pkgs/servers/home-assistant/custom-components/prometheus_sensor/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/samsungtv-smart/default.nix b/pkgs/servers/home-assistant/custom-components/samsungtv-smart/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/samsungtv-smart/default.nix rename to pkgs/servers/home-assistant/custom-components/samsungtv-smart/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/sensi/default.nix b/pkgs/servers/home-assistant/custom-components/sensi/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/sensi/default.nix rename to pkgs/servers/home-assistant/custom-components/sensi/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/smartir/default.nix b/pkgs/servers/home-assistant/custom-components/smartir/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/smartir/default.nix rename to pkgs/servers/home-assistant/custom-components/smartir/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/default.nix b/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/smartthinq-sensors/default.nix rename to pkgs/servers/home-assistant/custom-components/smartthinq-sensors/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/solax_modbus/default.nix b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/solax_modbus/default.nix rename to pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/solis-sensor/default.nix b/pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/solis-sensor/default.nix rename to pkgs/servers/home-assistant/custom-components/solis-sensor/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/somweb/default.nix b/pkgs/servers/home-assistant/custom-components/somweb/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/somweb/default.nix rename to pkgs/servers/home-assistant/custom-components/somweb/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/spook/default.nix b/pkgs/servers/home-assistant/custom-components/spook/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/spook/default.nix rename to pkgs/servers/home-assistant/custom-components/spook/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/tuya_local/default.nix b/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/tuya_local/default.nix rename to pkgs/servers/home-assistant/custom-components/tuya_local/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/default.nix b/pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/default.nix rename to pkgs/servers/home-assistant/custom-components/volkswagen_we_connect_id/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/volkswagencarnet/default.nix b/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/volkswagencarnet/default.nix rename to pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix rename to pkgs/servers/home-assistant/custom-components/waste_collection_schedule/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/default.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/default.nix rename to pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/default.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/xiaomi_miot/default.nix rename to pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/yassi/default.nix b/pkgs/servers/home-assistant/custom-components/yassi/package.nix similarity index 100% rename from pkgs/servers/home-assistant/custom-components/yassi/default.nix rename to pkgs/servers/home-assistant/custom-components/yassi/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 982de17fe824..e98f6f318436 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24313,10 +24313,10 @@ with pkgs; home-assistant = callPackage ../servers/home-assistant { }; buildHomeAssistantComponent = callPackage ../servers/home-assistant/build-custom-component { }; - home-assistant-custom-components = lib.recurseIntoAttrs - (callPackage ../servers/home-assistant/custom-components { - inherit (home-assistant.python.pkgs) callPackage; - }); + home-assistant-custom-components = lib.packagesFromDirectoryRecursive { + inherit (home-assistant.python.pkgs) callPackage; + directory = ../servers/home-assistant/custom-components; + }; home-assistant-custom-lovelace-modules = lib.recurseIntoAttrs (callPackage ../servers/home-assistant/custom-lovelace-modules {}); From 4b09bd0fec888c3cdb3f7c6ae196298b349a3fe5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Oct 2024 16:23:14 +0200 Subject: [PATCH 14/94] gotestwaf: 0.5.5 -> 0.5.6 Diff: https://github.com/wallarm/gotestwaf/compare/refs/tags/v0.5.5...v0.5.6 Changelog: https://github.com/wallarm/gotestwaf/releases/tag/v0.5.6 --- pkgs/tools/security/gotestwaf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gotestwaf/default.nix b/pkgs/tools/security/gotestwaf/default.nix index 6cbe088d6871..32797408a874 100644 --- a/pkgs/tools/security/gotestwaf/default.nix +++ b/pkgs/tools/security/gotestwaf/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gotestwaf"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "wallarm"; repo = "gotestwaf"; rev = "refs/tags/v${version}"; - hash = "sha256-stGjxv9cgYxxclQpyytN6dhFm2G1Gxbf9MdyKw6gEC4="; + hash = "sha256-bZ8cNREPUgIO7lJg0WBtc9qvkDUnfqtFNi612Ctcxo8="; }; vendorHash = "sha256-mPqCphweDF9RQibdjTaXXfXdO8NENHVMdIPxrJEw2g4="; From 27d3ece652409bc0d53dc2c50ae80060f1ba534d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 21 Oct 2024 16:55:03 +0200 Subject: [PATCH 15/94] python312Packages.huggingface-hub: 0.25.2 -> 0.26.1 Diff: https://github.com/huggingface/huggingface_hub/compare/refs/tags/v0.25.2...v0.26.1 Changelog: https://github.com/huggingface/huggingface_hub/releases/tag/v0.26.1 --- pkgs/development/python-modules/huggingface-hub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index 6d8e4af86d2c..4c2a46563665 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.25.2"; + version = "0.26.1"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-wUZkh8ti35F8bGtEKJZGSRySLvCkIWEFajQNWo/WCys="; + hash = "sha256-tro4Cvjyjc1vfAvYnfeKjh8ej83Z8l4cKe8SqIBVLXg="; }; build-system = [ setuptools ]; From 72868d9a305226d0bffefed98d728768b3f72243 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Oct 2024 17:22:09 +0200 Subject: [PATCH 16/94] albedo: init at 0.0.16 HTTP reflector and black hole https://github.com/coreruleset/albedo --- pkgs/by-name/al/albedo/package.nix | 33 ++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/al/albedo/package.nix diff --git a/pkgs/by-name/al/albedo/package.nix b/pkgs/by-name/al/albedo/package.nix new file mode 100644 index 000000000000..7b63f9e7040f --- /dev/null +++ b/pkgs/by-name/al/albedo/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "albedo"; + version = "0.0.16"; + + src = fetchFromGitHub { + owner = "coreruleset"; + repo = "albedo"; + rev = "refs/tags/v${version}"; + hash = "sha256-HMW0SIcPDCy2QNfxpMke+/d1XCNpyx6RL6RCZAmU+WE="; + }; + + vendorHash = "sha256-3YBcu/GEonEoORbB7x6YGpIl7kEzUQ9PAZNFB8NKb+c="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "HTTP reflector and black hole"; + homepage = "https://github.com/coreruleset/albedo"; + changelog = "https://github.com/coreruleset/albedo/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "albedo"; + }; +} From 8388d33079191c346e31614dab49f5587c5f1952 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 21 Oct 2024 08:52:01 -0700 Subject: [PATCH 17/94] signalbackup-tools: 20240929 -> 20241021-1 Diff: https://github.com/bepaald/signalbackup-tools/compare/20240929...20241021-1 --- .../instant-messengers/signalbackup-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 8cd6bed359fa..a4d74750fbd2 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20240929"; + version = "20241021-1"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; rev = version; - hash = "sha256-OXn/RMc2v099S8/atQTYz1YwSH0sD7o7ZImlrBmUlSE="; + hash = "sha256-fO/GSnmXsB4YVnfBBh1IXai15JeRLcAiihufIouBpxw="; }; nativeBuildInputs = [ From ee838247d4f14c923c49102bc1d5fa791425ee8e Mon Sep 17 00:00:00 2001 From: gruve-p Date: Fri, 11 Oct 2024 13:08:21 +0200 Subject: [PATCH 18/94] groestlcoin: 27.0 -> 28.0 --- .../blockchains/groestlcoin/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/blockchains/groestlcoin/default.nix b/pkgs/applications/blockchains/groestlcoin/default.nix index 18861f021431..b107cd237263 100644 --- a/pkgs/applications/blockchains/groestlcoin/default.nix +++ b/pkgs/applications/blockchains/groestlcoin/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchurl , fetchFromGitHub -, fetchpatch2 , autoreconfHook , pkg-config , installShellFiles @@ -15,6 +14,7 @@ , miniupnpc , zeromq , zlib +, db53 , sqlite , qrencode , qtbase ? null @@ -33,23 +33,15 @@ let in stdenv.mkDerivation rec { pname = if withGui then "groestlcoin" else "groestlcoind"; - version = "27.0"; + version = "28.0"; src = fetchFromGitHub { owner = "Groestlcoin"; repo = "groestlcoin"; rev = "v${version}"; - sha256 = "0f6vi2k5xvjrhiazfjcd4aj246dfcg51xsnqb9wdjl41cg0ckwmf"; + sha256 = "0kl7nq62362clgzxwwd5c256xnaar4ilxcvbralazxg47zv95r11"; }; - patches = [ - # upnp: add compatibility for miniupnpc 2.2.8 - (fetchpatch2 { - url = "https://github.com/Groestlcoin/groestlcoin/commit/8acdf66540834b9f9cf28f16d389e8b6a48516d5.patch?full_index=1"; - hash = "sha256-oDvHUvwAEp0LJCf6QBESn38Bu359TcPpLhvuLX3sm6M="; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkg-config installShellFiles ] ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ hexdump ] @@ -57,7 +49,7 @@ stdenv.mkDerivation rec { ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] - ++ lib.optionals withWallet [ sqlite ] + ++ lib.optionals withWallet [ db53 sqlite ] ++ lib.optionals withGui [ qrencode qtbase qttools ]; postInstall = '' From 9d3020640cbd7f824455228955d59a99edf9485c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 21 Oct 2024 18:27:58 +0200 Subject: [PATCH 19/94] python312Packages.sentence-transformers: 3.2.0 -> 3.2.1 Diff: https://github.com/UKPLab/sentence-transformers/compare/refs/tags/v3.2.0...v3.2.1 Changelog: https://github.com/UKPLab/sentence-transformers/releases/tag/3.2.1 --- .../python-modules/sentence-transformers/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix index c70ea216cd42..895b71d8cabe 100644 --- a/pkgs/development/python-modules/sentence-transformers/default.nix +++ b/pkgs/development/python-modules/sentence-transformers/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "sentence-transformers"; - version = "3.2.0"; + version = "3.2.1"; pyproject = true; src = fetchFromGitHub { owner = "UKPLab"; repo = "sentence-transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-T9y+usEOqz53Wv5gObD5o3gAlABHM3apoq/ySD5ynVg="; + hash = "sha256-5N5yObR3+3eV65ojFJFhzDbqtjNi/U2IhHlAaKttcVI="; }; build-system = [ setuptools ]; @@ -65,11 +65,16 @@ buildPythonPackage rec { disabledTests = [ # Tests require network access "test_cmnrl_same_grad" + "test_forward" + "test_initialization_with_embedding_dim" + "test_initialization_with_embedding_weights" "test_LabelAccuracyEvaluator" "test_model_card_reuse" "test_paraphrase_mining" "test_ParaphraseMiningEvaluator" + "test_save_and_load" "test_simple_encode" + "test_tokenize" "test_trainer" "test_trainer_invalid_column_names" "test_trainer_multi_dataset_errors" From b3413ccd2335c6ea779dafe97a2907095ace1d57 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 21 Oct 2024 22:13:37 +0400 Subject: [PATCH 20/94] =?UTF-8?q?postgresqlPackages.pgrouting:=203.6.2=20?= =?UTF-8?q?=E2=86=92=203.6.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/sql/postgresql/ext/pgrouting.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 86fab4f8dbae..d67a21755a06 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pgrouting"; - version = "3.6.2"; + version = "3.6.3"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ postgresql boost ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "pgRouting"; repo = "pgrouting"; rev = "v${version}"; - hash = "sha256-r+OkhieKTiOfYSnDbiy3p8V8cgb8I1+bneFwItDfDYo="; + hash = "sha256-VCoapUM7Vh4W1DUE/gWQ9YIRLbw63XlOWsgajJW+XNU="; }; installPhase = '' From f6429b355efc7f161c9a1f38352fd2ead6ee780c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Oct 2024 21:04:42 +0200 Subject: [PATCH 21/94] apkleaks: 2.6.2 -> 2.6.3 Diff: https://github.com/dwisiswant0/apkleaks/compare/refs/tags/v2.6.2...v2.6.3 Changelog: https://github.com/dwisiswant0/apkleaks/releases/tag/v2.6.3 --- pkgs/tools/security/apkleaks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/apkleaks/default.nix b/pkgs/tools/security/apkleaks/default.nix index a8be3c4323c8..17677755409d 100644 --- a/pkgs/tools/security/apkleaks/default.nix +++ b/pkgs/tools/security/apkleaks/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "apkleaks"; - version = "2.6.2"; + version = "2.6.3"; pyproject = true; src = fetchFromGitHub { owner = "dwisiswant0"; repo = "apkleaks"; rev = "refs/tags/v${version}"; - hash = "sha256-a7zOowvhV9H91RwNDImN2+ecixY8g3WUotlBQVdmLgA="; + hash = "sha256-8P4LZsyq0mSVdE6QhnW3QaaA3UAg4UDBS3jSg7Kg/oY="; }; build-system = with python3.pkgs; [ setuptools ]; From 06079ab9b637306bc18e9690513bf38ce5adca4f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Oct 2024 21:05:37 +0200 Subject: [PATCH 22/94] httpx: 1.6.8 -> 1.6.9 Diff: https://github.com/projectdiscovery/httpx/compare/refs/tags/v1.6.8...v1.6.9 Changelog: https://github.com/projectdiscovery/httpx/releases/tag/v1.6.9 --- pkgs/tools/security/httpx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index e42dcb6ec46c..b558409f0cdb 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.6.8"; + version = "1.6.9"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-YN79sO/XNU9/HqzN/MWfrcsIyAIcWJGdSIfn00o3alY="; + hash = "sha256-fkHMtFshRNtRhsxjbYOkeL2cln84NAa01jcGKips5Kk="; }; - vendorHash = "sha256-8QC6CiaI69U/pE3JcSi3key6IscvZkWcdbmNvikbP1w="; + vendorHash = "sha256-zTPJtuKPtsVsgMwHFjVwAh1/3DudW7TPWOMJ20nNu1I="; subPackages = [ "cmd/httpx" ]; From cb8cef92fd1fa8465b1f5533d01dbd918260ce66 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Oct 2024 21:06:18 +0200 Subject: [PATCH 23/94] python312Packages.fastcore: 1.7.17 -> 1.7.19 Diff: https://github.com/fastai/fastcore/compare/refs/tags/1.7.17...1.7.19 Changelog: https://github.com/fastai/fastcore/blob/1.7.19/CHANGELOG.md --- pkgs/development/python-modules/fastcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index 9d1b21213c1d..cc13fa17e153 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.7.17"; + version = "1.7.19"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "fastcore"; rev = "refs/tags/${version}"; - hash = "sha256-QBRlJoAOUMNCUQnb4yzU0g/RN0FkX4+swcdxyKROZTE="; + hash = "sha256-CJG/cKgqdUrJcYV5pgGjrnoXzRAj3xya7LwvchNGrPU="; }; build-system = [ setuptools ]; From d10227ccfafafa0f628468468ce33c15d441c701 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Oct 2024 21:13:39 +0200 Subject: [PATCH 24/94] python312Packages.holidays: 0.58 -> 0.59 Diff: https://github.com/vacanza/python-holidays/compare/refs/tags/v0.58...v0.59 Changelog: https://github.com/vacanza/python-holidays/releases/tag/v0.59 --- pkgs/development/python-modules/holidays/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index bf63055df896..56458ceee14d 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.58"; + version = "0.59"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; rev = "refs/tags/v${version}"; - hash = "sha256-qsBKUdYZLSxWAGExydOO37IWqEOrYdlRnE/MJmz7Nr8="; + hash = "sha256-g7ldsWqVWM1FtOB2gFrCuATD5PthZhbelKT4NV6Rovg="; }; build-system = [ From 80459ca629340867c85599658bfc70b179ebb110 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Oct 2024 21:29:20 +0200 Subject: [PATCH 25/94] python312Packages.tencentcloud-sdk-python: 3.0.1252 -> 3.0.1253 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1252...3.0.1253 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1253/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 8208f626622c..0631b8fc6da3 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1252"; + version = "3.0.1253"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-syJOzoaCB1opTN3IRQE7hXe+2G6gm8IxV3KA/3HTFME="; + hash = "sha256-UQeh2VTIIuTvvJ3+GfY0pfSFLyc2KCg0i5qlglhBAJY="; }; build-system = [ setuptools ]; From 3dc8abbb08a0ca92de951f0e13bd241bfd9edc01 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Oct 2024 21:30:19 +0200 Subject: [PATCH 26/94] checkov: 3.2.267 -> 3.2.269 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.267...3.2.269 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.269 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 49557a4a1c39..af7420b7f4f5 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.267"; + version = "3.2.269"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-9xAWk5RFpm4sD77exdc3kjXyvW0OR/2gv2Ox+lAONoA="; + hash = "sha256-bpXKSyuPhKby8pCQUrH6H9H5za5R8FsKnoqsm8P4zek="; }; patches = [ ./flake8-compat-5.x.patch ]; From 455f80e4cb8ce963a06b9befccdebe6db9c7ab9a Mon Sep 17 00:00:00 2001 From: Nate Smith Date: Tue, 15 Oct 2024 11:19:10 -0400 Subject: [PATCH 27/94] vimPlugins.nvim-treesitter-sexp: init at 2024-06-07 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index b40c1ebbd49b..8a644910a715 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -9425,6 +9425,18 @@ final: prev: meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/"; }; + nvim-treesitter-sexp = buildVimPlugin { + pname = "nvim-treesitter-sexp"; + version = "2024-06-07"; + src = fetchFromGitHub { + owner = "PaterJason"; + repo = "nvim-treesitter-sexp"; + rev = "32509f4071f9c8ba5655bf2e1ccf1f1cd8447da0"; + sha256 = "1mfayp49nglk4xv1zmzdc8d6dxkjn3dqlywhwwkcdnyqg6y4c6ks"; + }; + meta.homepage = "https://github.com/PaterJason/nvim-treesitter-sexp/"; + }; + nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; version = "2024-10-16"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 3dc4109ab99a..9793ddcb3350 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1676,6 +1676,10 @@ in nvim-treesitter-parsers = lib.recurseIntoAttrs self.nvim-treesitter.grammarPlugins; + nvim-treesitter-sexp = super.nvim-treesitter-sexp.overrideAttrs { + nvimRequireCheck = "treesitter-sexp"; + }; + nvim-ufo = super.nvim-ufo.overrideAttrs { dependencies = with self; [ promise-async ]; nvimRequireCheck = "ufo"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 2405a025b282..4897daf0f8cd 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -791,6 +791,7 @@ https://github.com/nvim-treesitter/nvim-treesitter-context/,, https://github.com/RRethy/nvim-treesitter-endwise/,HEAD, https://github.com/eddiebergman/nvim-treesitter-pyfold/,, https://github.com/nvim-treesitter/nvim-treesitter-refactor/,, +https://github.com/PaterJason/nvim-treesitter-sexp/,HEAD, https://github.com/nvim-treesitter/nvim-treesitter-textobjects/,, https://github.com/RRethy/nvim-treesitter-textsubjects/,HEAD, https://github.com/windwp/nvim-ts-autotag/,, From f4a29d61d2300e364be149df3894c61a47aa94b1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Oct 2024 21:54:34 +0200 Subject: [PATCH 28/94] python312Packages.playwrightcapture: 1.26.1 -> 1.26.2 Diff: https://github.com/Lookyloo/PlaywrightCapture/compare/refs/tags/v1.26.1...v1.26.2 Changelog: https://github.com/Lookyloo/PlaywrightCapture/releases/tag/v1.26.2 --- pkgs/development/python-modules/playwrightcapture/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index 58afee646cc8..5cf06d322fd1 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.26.1"; + version = "1.26.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; rev = "refs/tags/v${version}"; - hash = "sha256-zVwsRTsxic0/K6HyTLVRYCnBpSIF9Ly0TRJS90nADTg="; + hash = "sha256-JSgWOHMwjxStwMxRe4sFYLeRRgOkfWXlIpqeDfGDSNQ="; }; pythonRelaxDeps = [ From acaa56db5879b3336ceb32dee4b67a9980437b13 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Oct 2024 21:56:20 +0200 Subject: [PATCH 29/94] tlsx: 1.1.7 -> 1.1.8 Diff: https://github.com/projectdiscovery/tlsx/compare/refs/tags/v1.1.7...v1.1.8 Changelog: https://github.com/projectdiscovery/tlsx/releases/tag/v1.1.8 --- pkgs/tools/security/tlsx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/tlsx/default.nix b/pkgs/tools/security/tlsx/default.nix index 2a392b33a65c..e88777eb10de 100644 --- a/pkgs/tools/security/tlsx/default.nix +++ b/pkgs/tools/security/tlsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tlsx"; - version = "1.1.7"; + version = "1.1.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "tlsx"; rev = "refs/tags/v${version}"; - hash = "sha256-vCB1sUT5auZmIg3lHFdV905wDfay5R8v+5lEKIuVzEQ="; + hash = "sha256-AQiwHNHfwOJYIEsFm2YiksdTUxp5vkCL80rpvxHY2rA="; }; - vendorHash = "sha256-Tgvs5BUuRTGSU05O+8SSvHvReACqIXqt9MEJWB7O8p4="; + vendorHash = "sha256-KNyB+xK7TUf7XoVX/4xBTnG2lMMPVV5AOoUNi4aA/cM="; ldflags = [ "-s" From 5535146d5e1e59946a7a57df1867eda1f2879ea0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Oct 2024 21:58:46 +0200 Subject: [PATCH 30/94] yara-x: 0.9.0 -> 0.10.0 Diff: https://github.com/VirusTotal/yara-x/compare/refs/tags/v0.9.0...v0.10.0 Changelog: https://github.com/VirusTotal/yara-x/releases/tag/v0.10.0 --- pkgs/by-name/ya/yara-x/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix index 1bf147df8373..4d5110d28939 100644 --- a/pkgs/by-name/ya/yara-x/package.nix +++ b/pkgs/by-name/ya/yara-x/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "yara-x"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara-x"; rev = "refs/tags/v${version}"; - hash = "sha256-W5qZHPNfRe9RmsmRzA8xGPvLl6JCoVJ59N87p2ZnXGo="; + hash = "sha256-HZA4olgHYTlPnTZNGxQNQlGX//XgqslHOMOil5G76xs="; }; - cargoHash = "sha256-ofmTDO11hqr95vSKRtJgMZL2BeA4AkCRNLknzr4n88I="; + cargoHash = "sha256-l66vRrFxwxVThBy98RWIpUi6SJkPH6VZLd5fkq5AStU="; nativeBuildInputs = [ cmake installShellFiles ]; From 52262e10a70f60d1b63bd9c5d9219d6a87e56323 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Oct 2024 22:23:28 +0200 Subject: [PATCH 31/94] python312Packages.google-cloud-bigquery-datatransfer: 3.15.7 -> 3.16.0 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-bigquery-datatransfer-v3.16.0/packages/google-cloud-bigquery-datatransfer/CHANGELOG.md --- .../google-cloud-bigquery-datatransfer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index e830e78dd09d..384dcd6d0edd 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.15.7"; + version = "3.16.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_bigquery_datatransfer"; inherit version; - hash = "sha256-GLarRvI2eud/iNwj7ujZwIpK/b0ClhO0XUdBi4J9Lp0="; + hash = "sha256-EyYdNDLDmIPyBZ9zYLASahS0gUrJ9SXhdjokKKWZ4lU="; }; build-system = [ setuptools ]; From 1b7cee750a1e3f69c1ba7620e78150adc5183448 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Oct 2024 22:23:45 +0200 Subject: [PATCH 32/94] python312Packages.google-cloud-bigquery-storage: 2.26.0 -> 2.27.0 Changelog: https://github.com/googleapis/python-bigquery-storage/blob/v2.27.0/CHANGELOG.md --- .../python-modules/google-cloud-bigquery-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index 22389251e06c..7e71adc6791d 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.26.0"; + version = "2.27.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_bigquery_storage"; inherit version; - hash = "sha256-hAJ1vQpLIHwKyCG8xnQUBv+zte+UD6BQiakOtEA0U/o="; + hash = "sha256-Ui+rqaaL6n6YVwccM/r85e5SC3sXXaAEiQFyQq3o7Cc="; }; build-system = [ setuptools ]; From c8f33c0a85915096a6c11662c08f0ee0ea493f5a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Oct 2024 22:24:23 +0200 Subject: [PATCH 33/94] python312Packages.google-cloud-container: 2.51.0 -> 2.52.0 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-container-v2.52.0/packages/google-cloud-container/CHANGELOG.md --- .../python-modules/google-cloud-container/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 386b240f6b1f..25b517fef06a 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.51.0"; + version = "2.52.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_container"; inherit version; - hash = "sha256-q1F+/uzyVY10pP/XrF1sL0+6o7uKfITSuZTc+NqA/Zw="; + hash = "sha256-ei+sdoCmpbsndrSUof0eLmTkk1ZDsqAfuTu40btzsO8="; }; build-system = [ setuptools ]; From 3def589d716c8d3ceb65df7f3170561e6c8ab5f3 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Thu, 26 Sep 2024 12:27:41 +0200 Subject: [PATCH 34/94] gmt: make the geospatial team adopt it --- pkgs/applications/gis/gmt/dcw.nix | 2 +- pkgs/applications/gis/gmt/default.nix | 2 +- pkgs/applications/gis/gmt/gshhg.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/gis/gmt/dcw.nix b/pkgs/applications/gis/gmt/dcw.nix index 8c26be6bb2d4..092e86edcb66 100644 --- a/pkgs/applications/gis/gmt/dcw.nix +++ b/pkgs/applications/gis/gmt/dcw.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { for use by GMT, the Generic Mapping Tools. ''; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ tviti ]; + maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ tviti ]); }; } diff --git a/pkgs/applications/gis/gmt/default.nix b/pkgs/applications/gis/gmt/default.nix index 9eb1bde4266d..2f2528ff5bb9 100644 --- a/pkgs/applications/gis/gmt/default.nix +++ b/pkgs/applications/gis/gmt/default.nix @@ -106,7 +106,7 @@ in stdenv.mkDerivation (finalAttrs: { ''; platforms = lib.platforms.unix; license = lib.licenses.lgpl3Plus; - maintainers = with lib.maintainers; [ tviti ]; + maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ tviti ]); }; }) diff --git a/pkgs/applications/gis/gmt/gshhg.nix b/pkgs/applications/gis/gmt/gshhg.nix index 62758c71d594..d51f1dbbcb5a 100644 --- a/pkgs/applications/gis/gmt/gshhg.nix +++ b/pkgs/applications/gis/gmt/gshhg.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { Mapping Tools. ''; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ tviti ]; + maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ tviti ]); }; } From 56c1962a9a442715247a0ab0052ac5bd3f68d79b Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Sat, 28 Sep 2024 22:42:04 +0200 Subject: [PATCH 35/94] pygmt: adoption by the geospatial team --- pkgs/development/python-modules/pygmt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index a5850801030e..73960fec7b17 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -67,6 +67,6 @@ buildPythonPackage rec { homepage = "https://github.com/GenericMappingTools/pygmt"; license = licenses.bsd3; changelog = "https://github.com/GenericMappingTools/pygmt/releases/tag/v${version}"; - maintainers = with maintainers; [ sikmir ]; + maintainers = with maintainers; teams.geospatial.members; }; } From c6acae475d6430b53e3773bd878d2fd45a8dc1ef Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Oct 2024 22:26:05 +0200 Subject: [PATCH 36/94] python312Packages.google-cloud-error-reporting: 1.11.0 -> 1.11.1 Changelog: https://github.com/googleapis/python-error-reporting/blob/v1.11.1/CHANGELOG.md --- .../google-cloud-error-reporting/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index 56e898a15bfd..503cb06d33f8 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -16,14 +16,15 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.11.0"; + version = "1.11.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-+oeVT/ag00BEObbqzkC/EazEwnrWvRURnz3gnCBbn4k="; + pname = "google_cloud_error_reporting"; + inherit version; + hash = "sha256-1ir8o3jwzmfi7E8QPTn3E6RGtTOL9KM05NRaMRYzh5A="; }; build-system = [ setuptools ]; @@ -38,8 +39,8 @@ buildPythonPackage rec { nativeCheckInputs = [ google-cloud-testutils mock - pytestCheckHook pytest-asyncio + pytestCheckHook ]; disabledTests = [ From e57bce2eb4ddf1e522ec0756d38a9e36ed11a731 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Oct 2024 22:30:17 +0200 Subject: [PATCH 37/94] python312Packages.google-cloud-texttospeech: 2.17.2 -> 2.18.0 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-texttospeech-v2.18.0/packages/google-cloud-texttospeech/CHANGELOG.md --- .../python-modules/google-cloud-texttospeech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 5387654ffc7c..8164ebb27137 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.17.2"; + version = "2.18.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_texttospeech"; inherit version; - hash = "sha256-hRzD46MqUA/edzeEBh6c6l6ZYKxXaIOid19w1hNZhQo="; + hash = "sha256-jR91d6b4btSDNeEIFGgCYeKXbaVIiMih1YYETuGRlvQ="; }; build-system = [ setuptools ]; From 34a00f3d09be306790f065ed861df9aa58b87aa8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Oct 2024 22:34:47 +0200 Subject: [PATCH 38/94] python312Packages.httpx-ws: 0.6.1 -> 0.6.2 Diff: https://github.com/frankie567/httpx-ws/compare/refs/tags/v0.6.1...v0.6.2 --- pkgs/development/python-modules/httpx-ws/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httpx-ws/default.nix b/pkgs/development/python-modules/httpx-ws/default.nix index b2aca0e00a94..a6e84317d62c 100644 --- a/pkgs/development/python-modules/httpx-ws/default.nix +++ b/pkgs/development/python-modules/httpx-ws/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "httpx-ws"; - version = "0.6.1"; + version = "0.6.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "frankie567"; repo = "httpx-ws"; rev = "refs/tags/v${version}"; - hash = "sha256-mynr07px+rQb7x8GepQoUgBbh0720S0K2RJrboOoJXA="; + hash = "sha256-VsIYOGNEdX4rxjEa01M77arA3ddJS3cPFxXlf13QTuE="; }; # we don't need to use the hatch-regex-commit plugin From 0fdd9ce1b63413a7ff7bb96f68b09bd6d5f541c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Oct 2024 22:36:16 +0200 Subject: [PATCH 39/94] python312Packages.httpx-ws: refactor --- .../python-modules/httpx-ws/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/httpx-ws/default.nix b/pkgs/development/python-modules/httpx-ws/default.nix index a6e84317d62c..6150c2d09b54 100644 --- a/pkgs/development/python-modules/httpx-ws/default.nix +++ b/pkgs/development/python-modules/httpx-ws/default.nix @@ -1,17 +1,17 @@ { lib, + anyio, buildPythonPackage, fetchFromGitHub, - pythonOlder, hatchling, - anyio, httpcore, httpx, - wsproto, pytestCheckHook, + pythonOlder, starlette, trio, uvicorn, + wsproto, }: buildPythonPackage rec { @@ -19,7 +19,7 @@ buildPythonPackage rec { version = "0.6.2"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "frankie567"; @@ -46,8 +46,6 @@ buildPythonPackage rec { wsproto ]; - pythonImportsCheck = [ "httpx_ws" ]; - nativeCheckInputs = [ pytestCheckHook starlette @@ -55,6 +53,8 @@ buildPythonPackage rec { uvicorn ]; + pythonImportsCheck = [ "httpx_ws" ]; + disabledTestPaths = [ # hang "tests/test_api.py" @@ -63,6 +63,8 @@ buildPythonPackage rec { meta = with lib; { description = "WebSocket support for HTTPX"; homepage = "https://github.com/frankie567/httpx-ws"; + changelog = "https://github.com/frankie567/httpx-ws/releases/tag/v${version}"; license = licenses.mit; + maintainers = [ ]; }; } From b306dfc15832405bf600801d934d1b4de1c696ac Mon Sep 17 00:00:00 2001 From: Jon Erling Hustadnes Date: Sun, 13 Oct 2024 23:18:27 +0200 Subject: [PATCH 40/94] maintainers: add husjon --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ba6458af23e0..df60bb88429b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8938,6 +8938,12 @@ githubId = 6109326; name = "David Hummel"; }; + husjon = { + name = "Jon Erling Hustadnes"; + email = "jonerling.hustadnes+nixpkgs@gmail.com"; + github = "husjon"; + githubId = 554229; + }; husky = { email = "husky@husky.sh"; github = "huskyistaken"; From 1d144e89aae2b10a6a4ecf4b45998f1dd8507134 Mon Sep 17 00:00:00 2001 From: Jon Erling Hustadnes Date: Sun, 13 Oct 2024 22:52:58 +0200 Subject: [PATCH 41/94] tonelib-gfx: 4.7.8 -> 4.8.5 --- .../audio/tonelib-gfx/default.nix | 48 +++++++++++-------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/audio/tonelib-gfx/default.nix b/pkgs/applications/audio/tonelib-gfx/default.nix index 826433128e7d..032706e47f46 100644 --- a/pkgs/applications/audio/tonelib-gfx/default.nix +++ b/pkgs/applications/audio/tonelib-gfx/default.nix @@ -1,29 +1,33 @@ -{ lib -, stdenv -, fetchurl -, autoPatchelfHook -, dpkg -, alsa-lib -, freetype -, libglvnd -, curl -, libXcursor -, libXinerama -, libXrandr -, libXrender -, libjack2 +{ + lib, + stdenv, + fetchurl, + autoPatchelfHook, + dpkg, + alsa-lib, + freetype, + libglvnd, + curl, + libXcursor, + libXinerama, + libXrandr, + libXrender, + libjack2, }: stdenv.mkDerivation rec { pname = "tonelib-gfx"; - version = "4.7.8"; + version = "4.8.5"; src = fetchurl { - url = "https://tonelib.net/download/221222/ToneLib-GFX-amd64.deb"; - hash = "sha256-1sTwHqQYqNloZ3XSwhryqlW7b1FHh4ymtj3rKUcVZIo="; + url = "https://tonelib.vip/download/24-10-03/ToneLib-GFX-amd64.deb"; + hash = "sha256-RG5rliF4/9LDd07i5dSFQzTGPqyF6UmTfatKb59LZA4="; }; - nativeBuildInputs = [ autoPatchelfHook dpkg ]; + nativeBuildInputs = [ + autoPatchelfHook + dpkg + ]; buildInputs = [ stdenv.cc.cc.lib @@ -46,14 +50,18 @@ stdenv.mkDerivation rec { installPhase = '' mv usr $out substituteInPlace $out/share/applications/ToneLib-GFX.desktop --replace /usr/ $out/ - ''; + ''; meta = with lib; { description = "Tonelib GFX is an amp and effects modeling software for electric guitar and bass"; homepage = "https://tonelib.net/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ dan4ik605743 orivej ]; + maintainers = with maintainers; [ + dan4ik605743 + husjon + orivej + ]; platforms = [ "x86_64-linux" ]; mainProgram = "ToneLib-GFX"; }; From ccfb15a469e4d72db119bb9c0dfa5f7536866307 Mon Sep 17 00:00:00 2001 From: Vinny Meller Date: Mon, 21 Oct 2024 17:24:00 -0400 Subject: [PATCH 42/94] git-spice: install shell completions for bash, zsh, and fish --- pkgs/by-name/gi/git-spice/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/gi/git-spice/package.nix b/pkgs/by-name/gi/git-spice/package.nix index f54da3fdf7d4..60b1e35d709b 100644 --- a/pkgs/by-name/gi/git-spice/package.nix +++ b/pkgs/by-name/gi/git-spice/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, git, nix-update-script, + installShellFiles, }: buildGo123Module rec { @@ -22,6 +23,8 @@ buildGo123Module rec { subPackages = [ "." ]; + nativeBuildInputs = [ installShellFiles ]; + nativeCheckInputs = [ git ]; buildInputs = [ git ]; @@ -40,6 +43,13 @@ buildGo123Module rec { rm testdata/script/branch_submit_multiple_pr_templates.txt ''; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd gs \ + --bash <($out/bin/gs shell completion bash) \ + --zsh <($out/bin/gs shell completion zsh) \ + --fish <($out/bin/gs shell completion fish) + ''; + passthru.updateScript = nix-update-script { }; meta = { From 43b720e23e9cf1e5a510bcad3c54db03cf270550 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 21 Oct 2024 23:51:56 +0200 Subject: [PATCH 43/94] nvrh: 0.1.13 -> 0.1.14 Diff: https://github.com/mikew/nvrh/compare/refs/tags/v0.1.13...v0.1.14 Changelog: https://github.com/mikew/nvrh/blob/refs/tags/v0.1.14/CHANGELOG.md --- pkgs/by-name/nv/nvrh/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nv/nvrh/package.nix b/pkgs/by-name/nv/nvrh/package.nix index 8faaeec11a0f..eb574a043940 100644 --- a/pkgs/by-name/nv/nvrh/package.nix +++ b/pkgs/by-name/nv/nvrh/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "nvrh"; - version = "0.1.13"; + version = "0.1.14"; src = fetchFromGitHub { owner = "mikew"; repo = "nvrh"; rev = "refs/tags/v${version}"; - hash = "sha256-fVoyxq2iCUANEsq+mCaQnBV9kQ59PZsGi9r7bSwStwQ="; + hash = "sha256-ff+ZdUScgAaNHASYAASQ/lfkCyX600kNw2Rjpr3TbBc="; }; postPatch = '' From 3f119f80a5e8d9467a3f6bb947a94538af0be3b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Mon, 21 Oct 2024 22:33:28 +0200 Subject: [PATCH 44/94] nvidia-container-toolkit: assert nvidia driver is present Also, do not add the `nvidia` driver to `videoDrivers` automatically; assert it is present (or the datacenter one) instead. --- .../hardware/nvidia-container-toolkit/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix b/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix index 450651e8b601..3538e52bda3b 100644 --- a/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix +++ b/nixos/modules/services/hardware/nvidia-container-toolkit/default.nix @@ -78,6 +78,11 @@ }; config = lib.mkIf config.hardware.nvidia-container-toolkit.enable { + assertions = [ + { assertion = config.hardware.nvidia.datacenter.enable || lib.elem "nvidia" config.services.xserver.videoDrivers; + message = ''`nvidia-container-toolkit` requires nvidia datacenter or desktop drivers: set `hardware.nvidia.datacenter.enable` or add "nvidia" to `services.xserver.videoDrivers`''; + }]; + virtualisation.docker = { daemon.settings = lib.mkIf (lib.versionAtLeast config.virtualisation.docker.package.version "25") { @@ -130,9 +135,6 @@ ]); }; - services.xserver.videoDrivers = lib.mkIf - (!config.hardware.nvidia.datacenter.enable) [ "nvidia" ]; - systemd.services.nvidia-container-toolkit-cdi-generator = { description = "Container Device Interface (CDI) for Nvidia generator"; wantedBy = [ "multi-user.target" ]; From 620d7563c0087068f120069bdde5876c046bfed6 Mon Sep 17 00:00:00 2001 From: Joe Martin Date: Mon, 21 Oct 2024 14:34:06 -0700 Subject: [PATCH 45/94] uv: 0.4.20 -> 0.4.25 --- pkgs/by-name/uv/uv/Cargo.lock | 346 ++++++++++++++++----------------- pkgs/by-name/uv/uv/package.nix | 9 +- 2 files changed, 173 insertions(+), 182 deletions(-) diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock index 590eb84c8e88..066981fdff1d 100644 --- a/pkgs/by-name/uv/uv/Cargo.lock +++ b/pkgs/by-name/uv/uv/Cargo.lock @@ -4,19 +4,13 @@ version = 3 [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "adler2" version = "2.0.0" @@ -89,9 +83,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95" [[package]] name = "arrayref" @@ -160,9 +154,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.13" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e614738943d3f68c628ae3dbce7c3daffb196665f82f8c8ea6b65de73c79429" +checksum = "0cb8f1d480b0ea3783ab015936d2a55c87e219676f0c0b7dec61494043f21857" dependencies = [ "bzip2", "flate2", @@ -229,9 +223,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axoasset" @@ -314,7 +308,7 @@ dependencies = [ "addr2line", "cfg-if", "libc", - "miniz_oxide 0.8.0", + "miniz_oxide", "object", "rustc-demangle", "windows-targets 0.52.6", @@ -407,9 +401,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" [[package]] name = "byteorder" @@ -425,9 +419,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "bzip2" @@ -499,9 +493,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.1.19" +version = "1.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d74707dde2ba56f86ae90effb3b43ddd369504387e718014de010cec7959800" +checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" dependencies = [ "jobserver", "libc", @@ -559,9 +553,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.19" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" dependencies = [ "clap_builder", "clap_derive", @@ -569,9 +563,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.19" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" dependencies = [ "anstream", "anstyle", @@ -582,9 +576,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.26" +version = "4.5.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "205d5ef6d485fa47606b98b0ddc4ead26eb850aaa86abfb562a94fb3280ecba0" +checksum = "9646e2e245bf62f45d39a0f3f36f1171ad1ea0d6967fd114bca72cb02a8fcdfb" dependencies = [ "clap", ] @@ -602,9 +596,9 @@ dependencies = [ [[package]] name = "clap_complete_nushell" -version = "4.5.3" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe32110e006bccf720f8c9af3fee1ba7db290c724eab61544e1d3295be3a40e" +checksum = "315902e790cc6e5ddd20cbd313c1d0d49db77f191e149f96397230fb82a17677" dependencies = [ "clap", "clap_complete", @@ -847,7 +841,7 @@ version = "3.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" dependencies = [ - "nix 0.29.0", + "nix", "windows-sys 0.59.0", ] @@ -1052,9 +1046,9 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab" dependencies = [ "simd-adler32", ] @@ -1085,7 +1079,7 @@ checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "libz-ng-sys", - "miniz_oxide 0.8.0", + "miniz_oxide", ] [[package]] @@ -1290,9 +1284,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" @@ -1411,12 +1405,12 @@ dependencies = [ [[package]] name = "homedir" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bed305c13ce3829a09d627f5d43ff738482a09361ae4eb8039993b55fb10e5e" +checksum = "5bdbbd5bc8c5749697ccaa352fa45aff8730cf21c68029c0eef1ffed7c3d6ba2" dependencies = [ "cfg-if", - "nix 0.26.4", + "nix", "widestring", "windows 0.57.0", ] @@ -1466,15 +1460,15 @@ dependencies = [ [[package]] name = "http-content-range" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f0d1a8ef218a86416107794b34cc446958d9203556c312bb41eab4c924c1d2e" +checksum = "aa7929c876417cd3ece616950474c7dff5b0150a2b53bd7e7fda55afa086c22b" [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -1484,9 +1478,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" dependencies = [ "bytes", "futures-channel", @@ -1644,9 +1638,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is-terminal" @@ -1747,9 +1741,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -1806,9 +1800,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libmimalloc-sys" @@ -1828,7 +1822,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", - "redox_syscall 0.5.4", + "redox_syscall 0.5.7", ] [[package]] @@ -1945,15 +1939,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - [[package]] name = "miette" version = "7.2.0" @@ -2008,16 +1993,6 @@ dependencies = [ "unicase", ] -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", - "simd-adler32", -] - [[package]] name = "miniz_oxide" version = "0.8.0" @@ -2025,6 +2000,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ "adler2", + "simd-adler32", ] [[package]] @@ -2077,19 +2053,6 @@ dependencies = [ "rand", ] -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset", - "pin-utils", -] - [[package]] name = "nix" version = "0.29.0" @@ -2154,18 +2117,18 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.20.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ea5043e58958ee56f3e15a90aee535795cd7dfd319846288d93c5b57d85cbe" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "oorandom" @@ -2246,7 +2209,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.4", + "redox_syscall 0.5.7", "smallvec", "windows-targets 0.52.6", ] @@ -2265,9 +2228,9 @@ checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" [[package]] name = "pathdiff" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" +checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361" [[package]] name = "percent-encoding" @@ -2277,9 +2240,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.12" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c73c26c01b8c87956cea613c907c9d6ecffd8d18a2a5908e5de0adfaa185cea" +checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", "thiserror", @@ -2288,9 +2251,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.12" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "664d22978e2815783adbdd2c588b455b1bd625299ce36b2a99881ac9627e6d8d" +checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd" dependencies = [ "pest", "pest_generator", @@ -2298,9 +2261,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.12" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2d5487022d5d33f4c30d91c22afa240ce2a644e87fe08caad974d4eab6badbe" +checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e" dependencies = [ "pest", "pest_meta", @@ -2311,9 +2274,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.7.12" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0091754bbd0ea592c4deb3a122ce8ecbb0753b738aa82bc055fcc2eccc8d8174" +checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d" dependencies = [ "once_cell", "pest", @@ -2338,18 +2301,18 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" dependencies = [ "proc-macro2", "quote", @@ -2376,9 +2339,9 @@ checksum = "d15b6607fa632996eb8a17c9041cb6071cb75ac057abd45dece578723ea8c7c0" [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "plain" @@ -2398,15 +2361,15 @@ dependencies = [ [[package]] name = "png" -version = "0.17.13" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0" dependencies = [ "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.4", + "miniz_oxide", ] [[package]] @@ -2420,9 +2383,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "ppv-lite86" @@ -2475,9 +2438,9 @@ dependencies = [ [[package]] name = "priority-queue" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "560bcab673ff7f6ca9e270c17bf3affd8a05e3bd9207f123b0d45076fd8197e8" +checksum = "714c75db297bc88a63783ffc6ab9f830698a6705aa0201416931759ef4c8183d" dependencies = [ "autocfg", "equivalent", @@ -2486,9 +2449,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" dependencies = [ "unicode-ident", ] @@ -2516,7 +2479,7 @@ dependencies = [ [[package]] name = "pubgrub" version = "0.2.1" -source = "git+https://github.com/astral-sh/pubgrub?rev=388685a8711092971930986644cfed152d1a1f6c#388685a8711092971930986644cfed152d1a1f6c" +source = "git+https://github.com/astral-sh/pubgrub?rev=7243f4faf8e54837aa8a401a18406e7173de4ad5#7243f4faf8e54837aa8a401a18406e7173de4ad5" dependencies = [ "indexmap", "log", @@ -2673,9 +2636,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] @@ -2748,9 +2711,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rend" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c1f1959e4db12c985c0283656be0925f1539549db1e47c4bd0b8b599e1ef7" +checksum = "a35e8a6bf28cd121053a66aa2e6a2e3eaffad4a60012179f0e864aa5ffeff215" dependencies = [ "bytecheck", ] @@ -2767,6 +2730,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", + "h2", "http", "http-body", "http-body-util", @@ -2807,7 +2771,7 @@ dependencies = [ [[package]] name = "reqwest-middleware" version = "0.3.3" -source = "git+https://github.com/astral-sh/reqwest-middleware?rev=5e3eaf254b5bd481c75d2710eed055f95b756913#5e3eaf254b5bd481c75d2710eed055f95b756913" +source = "git+https://github.com/TrueLayer/reqwest-middleware?rev=d95ec5a99fcc9a4339e1850d40378bbfe55ab121#d95ec5a99fcc9a4339e1850d40378bbfe55ab121" dependencies = [ "anyhow", "async-trait", @@ -2821,7 +2785,7 @@ dependencies = [ [[package]] name = "reqwest-retry" version = "0.7.1" -source = "git+https://github.com/astral-sh/reqwest-middleware?rev=5e3eaf254b5bd481c75d2710eed055f95b756913#5e3eaf254b5bd481c75d2710eed055f95b756913" +source = "git+https://github.com/TrueLayer/reqwest-middleware?rev=d95ec5a99fcc9a4339e1850d40378bbfe55ab121#d95ec5a99fcc9a4339e1850d40378bbfe55ab121" dependencies = [ "anyhow", "async-trait", @@ -2974,8 +2938,7 @@ checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" [[package]] name = "rust-netrc" version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32662f97cbfdbad9d5f78f1338116f06871e7dae4fd37e9f59a0f57cf2044868" +source = "git+https://github.com/gribouille/netrc?rev=544f3890b621f0dc30fcefb4f804269c160ce2e9#544f3890b621f0dc30fcefb4f804269c160ce2e9" dependencies = [ "thiserror", ] @@ -3007,9 +2970,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.13" +version = "0.23.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993" dependencies = [ "once_cell", "ring", @@ -3034,19 +2997,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.3" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" [[package]] name = "rustls-webpki" @@ -3092,9 +3054,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" dependencies = [ "windows-sys 0.59.0", ] @@ -3171,9 +3133,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -3229,9 +3191,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "itoa", "memchr", @@ -3241,9 +3203,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -3309,9 +3271,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "simdutf8" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "similar" @@ -3460,9 +3422,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.79" +version = "2.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021" dependencies = [ "proc-macro2", "quote", @@ -3975,9 +3937,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" [[package]] name = "unicase" @@ -3990,9 +3952,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-bidi-mirroring" @@ -4026,18 +3988,18 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-script" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" +checksum = "9fb421b350c9aff471779e262955939f565ec18b86c15364e6bdf0d662ca7c1f" [[package]] name = "unicode-vo" @@ -4047,9 +4009,9 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unscanny" @@ -4128,13 +4090,13 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" [[package]] name = "uv" -version = "0.4.20" +version = "0.4.25" dependencies = [ "anstream", "anyhow", @@ -4144,6 +4106,7 @@ dependencies = [ "base64 0.22.1", "byteorder", "clap", + "console", "ctrlc", "etcetera", "filetime", @@ -4187,6 +4150,7 @@ dependencies = [ "uv-cli", "uv-client", "uv-configuration", + "uv-console", "uv-dispatch", "uv-distribution", "uv-distribution-filename", @@ -4210,8 +4174,10 @@ dependencies = [ "uv-scripts", "uv-settings", "uv-shell", + "uv-static", "uv-tool", "uv-types", + "uv-version", "uv-virtualenv", "uv-warnings", "uv-workspace", @@ -4240,6 +4206,7 @@ dependencies = [ "url", "urlencoding", "uv-once-map", + "uv-static", "wiremock", ] @@ -4294,7 +4261,6 @@ dependencies = [ "uv-pep508", "uv-pubgrub", "uv-pypi-types", - "uv-version", "uv-warnings", "walkdir", "zip", @@ -4321,12 +4287,14 @@ dependencies = [ "toml_edit", "tracing", "uv-configuration", + "uv-distribution", "uv-distribution-types", "uv-fs", "uv-pep440", "uv-pep508", "uv-pypi-types", "uv-python", + "uv-static", "uv-types", "uv-virtualenv", ] @@ -4352,6 +4320,7 @@ dependencies = [ "uv-fs", "uv-normalize", "uv-pypi-types", + "uv-static", "walkdir", ] @@ -4399,6 +4368,7 @@ dependencies = [ "uv-python", "uv-resolver", "uv-settings", + "uv-static", "uv-version", "uv-warnings", ] @@ -4450,6 +4420,7 @@ dependencies = [ "uv-pep508", "uv-platform-tags", "uv-pypi-types", + "uv-static", "uv-version", "uv-warnings", ] @@ -4478,6 +4449,7 @@ dependencies = [ "uv-pep508", "uv-platform-tags", "uv-pypi-types", + "uv-static", "which", ] @@ -4525,6 +4497,7 @@ dependencies = [ "uv-pypi-types", "uv-python", "uv-settings", + "uv-static", "uv-workspace", "walkdir", ] @@ -4618,6 +4591,7 @@ name = "uv-distribution-types" version = "0.0.1" dependencies = [ "anyhow", + "bitflags 2.6.0", "fs-err", "itertools 0.13.0", "jiff", @@ -4630,6 +4604,7 @@ dependencies = [ "tracing", "url", "urlencoding", + "uv-auth", "uv-cache-info", "uv-cache-key", "uv-distribution-filename", @@ -4707,6 +4682,8 @@ dependencies = [ "uv-auth", "uv-cache-key", "uv-fs", + "uv-static", + "which", ] [[package]] @@ -4777,6 +4754,7 @@ dependencies = [ "uv-platform-tags", "uv-pypi-types", "uv-python", + "uv-static", "uv-types", "uv-warnings", "walkdir", @@ -4937,6 +4915,7 @@ dependencies = [ "uv-fs", "uv-metadata", "uv-pypi-types", + "uv-static", "uv-warnings", ] @@ -5010,6 +4989,7 @@ dependencies = [ "uv-platform-tags", "uv-pypi-types", "uv-state", + "uv-static", "uv-warnings", "which", "windows-registry", @@ -5128,6 +5108,7 @@ dependencies = [ "uv-pypi-types", "uv-python", "uv-requirements-txt", + "uv-static", "uv-types", "uv-warnings", "uv-workspace", @@ -5143,6 +5124,7 @@ dependencies = [ "serde", "thiserror", "toml", + "uv-distribution-types", "uv-pep440", "uv-pep508", "uv-pypi-types", @@ -5176,6 +5158,7 @@ dependencies = [ "uv-pypi-types", "uv-python", "uv-resolver", + "uv-static", "uv-warnings", ] @@ -5188,6 +5171,7 @@ dependencies = [ "same-file", "tracing", "uv-fs", + "uv-static", "winreg", ] @@ -5201,6 +5185,10 @@ dependencies = [ "tempfile", ] +[[package]] +name = "uv-static" +version = "0.0.1" + [[package]] name = "uv-tool" version = "0.0.1" @@ -5223,6 +5211,7 @@ dependencies = [ "uv-python", "uv-settings", "uv-state", + "uv-static", "uv-virtualenv", ] @@ -5248,7 +5237,7 @@ dependencies = [ [[package]] name = "uv-version" -version = "0.4.20" +version = "0.4.25" [[package]] name = "uv-virtualenv" @@ -5292,7 +5281,6 @@ dependencies = [ "same-file", "schemars", "serde", - "serde-untagged", "tempfile", "thiserror", "tokio", @@ -5300,6 +5288,7 @@ dependencies = [ "toml_edit", "tracing", "url", + "uv-distribution-types", "uv-fs", "uv-git", "uv-macros", @@ -5308,6 +5297,7 @@ dependencies = [ "uv-pep440", "uv-pep508", "uv-pypi-types", + "uv-static", "uv-warnings", ] @@ -5359,9 +5349,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -5370,9 +5360,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", @@ -5385,9 +5375,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" dependencies = [ "cfg-if", "js-sys", @@ -5397,9 +5387,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5407,9 +5397,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", @@ -5420,15 +5410,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasm-streams" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" dependencies = [ "futures-util", "js-sys", @@ -5454,9 +5444,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" dependencies = [ "js-sys", "wasm-bindgen", @@ -5464,9 +5454,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.5" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" dependencies = [ "rustls-pki-types", ] @@ -5518,7 +5508,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -5805,9 +5795,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 9ac434f41c54..90da34f6d6d7 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -15,22 +15,23 @@ python3Packages.buildPythonApplication rec { pname = "uv"; - version = "0.4.20"; + version = "0.4.25"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = "refs/tags/${version}"; - hash = "sha256-PfjYGCPPRZVm4H9oxkWdjW7kHu4CqdkenFgL61dOU5k="; + hash = "sha256-qAfM9I2NboYkUukWnOjuGcdjp8IONAI6Qwwg1r9kCGg="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { "async_zip-0.0.17" = "sha256-3k9rc4yHWhqsCUJ17K55F8aQoCKdVamrWAn6IDWo3Ss="; - "pubgrub-0.2.1" = "sha256-pU+F6hwqy+r6tz5OBoB6gU0+vdH6F3ikUaPrcvYRX2c="; - "reqwest-middleware-0.3.3" = "sha256-csQN7jZTifliSTsOm6YrjPVgsXBOfelY7LkHD1HkNGQ="; + "pubgrub-0.2.1" = "sha256-mSpRBdQJWtKKD1zHkV7vuyfKTDY6Ejgjll5q5ryCfmY="; + "reqwest-middleware-0.3.3" = "sha256-KjyXB65a7SAfwmxokH2PQFFcJc6io0xuIBQ/yZELJzM="; + "rust-netrc-0.1.1" = "sha256-DeDAm2k4/2A9Nw8zXeKOMdxhbseGIrRXH0KgGf2shOc="; "tl-0.7.8" = "sha256-F06zVeSZA4adT6AzLzz1i9uxpI1b8P1h+05fFfjm3GQ="; }; }; From f02308bfe52ff4de092dd3e592dc44e844d1058a Mon Sep 17 00:00:00 2001 From: Shaw Vrana Date: Mon, 21 Oct 2024 16:25:37 -0700 Subject: [PATCH 46/94] wireguard-go: fix build Resolves #350363 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0557a51ad6cf..a9205bbc272e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13814,7 +13814,9 @@ with pkgs; wipe = callPackage ../tools/security/wipe { }; - wireguard-go = callPackage ../tools/networking/wireguard-go { }; + wireguard-go = callPackage ../tools/networking/wireguard-go { + buildGoModule = buildGo122Module; + }; wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { }; From 1816c3472c7ba4b10af2ea2b71ebb40cab7a14a1 Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Tue, 22 Oct 2024 01:37:35 +0200 Subject: [PATCH 47/94] batman-adv: 2024.2 -> 2024.3 Changelog: https://www.open-mesh.org/news/118 --- pkgs/os-specific/linux/batman-adv/version.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix index 6f0cab252b92..ca2da5f22100 100644 --- a/pkgs/os-specific/linux/batman-adv/version.nix +++ b/pkgs/os-specific/linux/batman-adv/version.nix @@ -1,16 +1,16 @@ { - version = "2024.2"; + version = "2024.3"; # To get these, run: # # ``` # for tool in alfred batctl batman-adv; do - # nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2024.2/$tool-2024.2.tar.gz --type sha256 | xargs nix hash to-sri --type sha256 + # nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2024.3/$tool-2024.3.tar.gz --type sha256 | xargs nix hash to-sri --type sha256 # done # ``` sha256 = { - alfred = "sha256-Kpvr62fIh1n+31fRjm79qtDECPIGikYlIBfCJ8sQlnI="; - batctl = "sha256-ywKVMJP/wscA0SLAOj2eTYZ/ZG0wOPMdCpAeWP+ZXQc="; - batman-adv = "sha256-dpKm3uei8/ZnMumuyMcWTgwYGBZ/OvBjv/P/+7AZlkM="; + alfred = "sha256-1xFDOMGgZGla9x1Y3gNnenIZsHxVQpuA+G3APAJJ/+o="; + batctl = "sha256-Zl5lXto4FBUhik1fX9d/8zxPqbXtu36I6DkJaWHjYAs="; + batman-adv = "sha256-uWgX7R9PSJF8MlUKhPqtjIfs9Tqm9vRswmVUuZm1f/M="; }; } From ed88329f5f751972acf4309e084e66ccff62066d Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Tue, 22 Oct 2024 01:14:14 +0100 Subject: [PATCH 48/94] factorio: 2.0.7 -> 2.0.8 Note that this also deletes factorio-space-age-experimental; this is left in top-level/all-packages.nix for now since I don't know if they plan to bring it back. Longer term we should make it resolve to stable if it doesn't exist, probably. --- pkgs/games/factorio/versions.json | 48 +++++++++++++------------------ 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 3c4139657b68..63ea8becf28f 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,20 +2,20 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-2.0.7.tar.xz", + "name": "factorio_alpha_x64-2.0.8.tar.xz", "needsAuth": true, - "sha256": "14gsl01j06d0cfii2zsp0njak3hf8kgb9ig9i3prbch507bmfw6q", + "sha256": "11g1fgfm0lki9j2jsfmvlxzisbyx7482ia2qf7gnjcqhp6jkdsll", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.7/alpha/linux64", - "version": "2.0.7" + "url": "https://factorio.com/get-download/2.0.8/alpha/linux64", + "version": "2.0.8" }, "stable": { - "name": "factorio_alpha_x64-2.0.7.tar.xz", + "name": "factorio_alpha_x64-2.0.8.tar.xz", "needsAuth": true, - "sha256": "14gsl01j06d0cfii2zsp0njak3hf8kgb9ig9i3prbch507bmfw6q", + "sha256": "11g1fgfm0lki9j2jsfmvlxzisbyx7482ia2qf7gnjcqhp6jkdsll", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.7/alpha/linux64", - "version": "2.0.7" + "url": "https://factorio.com/get-download/2.0.8/alpha/linux64", + "version": "2.0.8" } }, "demo": { @@ -37,39 +37,31 @@ } }, "expansion": { - "experimental": { - "name": "factorio_expansion_x64-2.0.7.tar.xz", - "needsAuth": true, - "sha256": "1zvk1skkm37kyikq4l1q285l8zhxc6lqvs1x2y2ccxwd4cdm6r96", - "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.7/expansion/linux64", - "version": "2.0.7" - }, "stable": { - "name": "factorio_expansion_x64-2.0.7.tar.xz", + "name": "factorio_expansion_x64-2.0.8.tar.xz", "needsAuth": true, - "sha256": "1zvk1skkm37kyikq4l1q285l8zhxc6lqvs1x2y2ccxwd4cdm6r96", + "sha256": "0q3abb01ld1mlbp21lgzpa62j1gybs982yzan5j1axma9n1ax3j0", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.7/expansion/linux64", - "version": "2.0.7" + "url": "https://factorio.com/get-download/2.0.8/expansion/linux64", + "version": "2.0.8" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-2.0.7.tar.xz", + "name": "factorio_headless_x64-2.0.8.tar.xz", "needsAuth": false, - "sha256": "0qi7vypm4iy3cp9qyl3cvvm606g9g37sa2pls4y7glxiwng4m9p6", + "sha256": "1jp1vlc4indicgy0xnrxq87h32wcv9s4g2hqbfb4ygiaam6lqnfr", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.7/headless/linux64", - "version": "2.0.7" + "url": "https://factorio.com/get-download/2.0.8/headless/linux64", + "version": "2.0.8" }, "stable": { - "name": "factorio_headless_x64-2.0.7.tar.xz", + "name": "factorio_headless_x64-2.0.8.tar.xz", "needsAuth": false, - "sha256": "0qi7vypm4iy3cp9qyl3cvvm606g9g37sa2pls4y7glxiwng4m9p6", + "sha256": "1jp1vlc4indicgy0xnrxq87h32wcv9s4g2hqbfb4ygiaam6lqnfr", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.7/headless/linux64", - "version": "2.0.7" + "url": "https://factorio.com/get-download/2.0.8/headless/linux64", + "version": "2.0.8" } } } From 108dd28960c01dbcb0e9655f5a8b6c6a7be73a79 Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Sun, 20 Oct 2024 22:22:52 -0700 Subject: [PATCH 49/94] git-prole: 0.1.1 -> 0.5.1 Diff: https://github.com/9999years/git-prole/compare/refs/tags/v0.1.1...v0.5.1 Changelog: https://github.com/9999years/git-prole/releases/tag/v0.5.1 Changelog: https://github.com/9999years/git-prole/releases/tag/v0.5.0 Changelog: https://github.com/9999years/git-prole/releases/tag/v0.4.0 Changes: - Convert multiple worktrees - Improve path display - Fix copying broken symlinks in `git prole add` - Print a message if there's nothing to do when converting a repository - Log working directory and env variables when running commands - Fix `git prole add` in the container directory - Run commands when adding worktrees - `git prole add` now knows how to create `--detached` worktrees - Add `branch_replacements` option - Rework config option names - Rename `git prole config generate` to `git prole config init` - Add a user manual --- pkgs/by-name/gi/git-prole/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/git-prole/package.nix b/pkgs/by-name/gi/git-prole/package.nix index f3b2a4723da3..9519c7840eeb 100644 --- a/pkgs/by-name/gi/git-prole/package.nix +++ b/pkgs/by-name/gi/git-prole/package.nix @@ -7,7 +7,7 @@ nix-update-script, }: let - version = "0.1.1"; + version = "0.5.1"; in rustPlatform.buildRustPackage { pname = "git-prole"; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage { owner = "9999years"; repo = "git-prole"; rev = "refs/tags/v${version}"; - hash = "sha256-IJsNZt5eID1ghz5Rj53OfidgPoMS2qq+7qgqYEu4zPc="; + hash = "sha256-jJEskahZRCpM2WEH4myTLfowQxEJ4WCNXbTwGkwBHnY="; }; - cargoHash = "sha256-2z7UEHVomm2zuImdcQq0G9fEhKrHLrPNUhVrFugG3w4="; + cargoHash = "sha256-u4UJH+dIDI+I6fEQTRe3RRufYZwxBENxnwULSSCOZF8="; nativeCheckInputs = [ git From 10c92665ec389e283624196998f99f3fc29d715e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 21 Oct 2024 02:28:56 +0200 Subject: [PATCH 50/94] python312Packages.qrcode: 7.4.2 -> 8.0 https://github.com/lincolnloop/python-qrcode/blob/v8.0/CHANGES.rst --- .../python-modules/qrcode/default.nix | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/qrcode/default.nix b/pkgs/development/python-modules/qrcode/default.nix index e14d4ab416fc..5099900a29a1 100644 --- a/pkgs/development/python-modules/qrcode/default.nix +++ b/pkgs/development/python-modules/qrcode/default.nix @@ -2,42 +2,47 @@ lib, buildPythonPackage, fetchPypi, - mock, + pythonAtLeast, + + # build-system + poetry-core, + + # dependencies pillow, pypng, + + # tests + mock, pytestCheckHook, - pythonAtLeast, qrcode, - setuptools, testers, - typing-extensions, }: buildPythonPackage rec { pname = "qrcode"; - version = "7.4.2"; + version = "8.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ndlpRUgn4Sfb2TaWsgdHI55tVA4IKTfJDxSslbMPWEU="; + hash = "sha256-AlzisVD3/kKW0Rbum61FWmZDq09ufc5UFhOkdYy840c="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ - typing-extensions - pypng - # imports pkg_resouces in console_scripts.py - setuptools - ]; - - optional-dependencies.pil = [ pillow ]; + optional-dependencies = { + pil = [ pillow ]; + png = [ pypng ]; + all = [ + pypng + pillow + ]; + }; nativeCheckInputs = [ mock pytestCheckHook - ] ++ optional-dependencies.pil; + ] ++ lib.flatten (lib.attrValues optional-dependencies); passthru.tests = { version = testers.testVersion { From bd281d0259a18e7e91502f984398cc6f17ccbe5a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Oct 2024 00:09:27 +0200 Subject: [PATCH 51/94] pretalx: 2024.2.1 -> 2024.3.0 https://docs.pretalx.org/changelog/#v2024-3-0 --- nixos/modules/services/web-apps/pretalx.nix | 1 - pkgs/by-name/pr/pretalx/package.nix | 17 +++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/web-apps/pretalx.nix b/nixos/modules/services/web-apps/pretalx.nix index 35af8c26482c..53956de22fcd 100644 --- a/nixos/modules/services/web-apps/pretalx.nix +++ b/nixos/modules/services/web-apps/pretalx.nix @@ -22,7 +22,6 @@ let ] ++ finalPackage.optional-dependencies.redis ++ lib.optionals cfg.celery.enable [ celery ] - ++ lib.optionals (cfg.settings.database.backend == "mysql") finalPackage.optional-dependencies.mysql ++ lib.optionals (cfg.settings.database.backend == "postgresql") finalPackage.optional-dependencies.postgres; }; in diff --git a/pkgs/by-name/pr/pretalx/package.nix b/pkgs/by-name/pr/pretalx/package.nix index 0abf3996cb58..c0b5c56fbc23 100644 --- a/pkgs/by-name/pr/pretalx/package.nix +++ b/pkgs/by-name/pr/pretalx/package.nix @@ -11,6 +11,8 @@ let python = python3.override { self = python; packageOverrides = final: prev: { + django = prev.django_5; + django-bootstrap4 = prev.django-bootstrap4.overridePythonAttrs (oldAttrs: rec { version = "3.0.0"; src = oldAttrs.src.override { @@ -26,16 +28,22 @@ let # fails with some assertions doCheck = false; }); + + django-extensions = prev.django-extensions.overridePythonAttrs { + # Compat issues with Django 5.1 + # https://github.com/django-extensions/django-extensions/issues/1885 + doCheck = false; + }; }; }; - version = "2024.2.1"; + version = "2024.3.0"; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx"; rev = "v${version}"; - hash = "sha256-D0ju9aOVy/new9GWqyFalZYCisdmM7irWSbn2TVCJYQ="; + hash = "sha256-Xv3VwYrwCGgOUf1ilD58ATj+bkehF9+im4124ivCaEU="; }; meta = with lib; { @@ -54,7 +62,7 @@ let sourceRoot = "${src.name}/src/pretalx/frontend/schedule-editor"; - npmDepsHash = "sha256-EAdeXdcC3gHun6BOHzvqpzv9+oDl1b/VTeNkYLiD+hA="; + npmDepsHash = "sha256-i7awRuR7NxhpxN2IZuI01PsN6FjXht7BxTbB1k039HA="; npmBuildScript = "build"; @@ -146,9 +154,6 @@ python.pkgs.buildPythonApplication rec { ++ plugins; optional-dependencies = { - mysql = with python.pkgs; [ - mysqlclient - ]; postgres = with python.pkgs; [ psycopg2 ]; From 7d2fd18921808cc6727d5fd3195a6bc28850e1a0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Oct 2024 02:46:13 +0200 Subject: [PATCH 52/94] nixos/pretalx: feature the files.upload_limit setting The default of 10 MiB might be too constraining for slide decks and collateral in 2024. --- nixos/modules/services/web-apps/pretalx.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/modules/services/web-apps/pretalx.nix b/nixos/modules/services/web-apps/pretalx.nix index 53956de22fcd..89952f09c92e 100644 --- a/nixos/modules/services/web-apps/pretalx.nix +++ b/nixos/modules/services/web-apps/pretalx.nix @@ -183,6 +183,17 @@ in }; }; + files = { + upload_limit = lib.mkOption { + type = lib.types.ints.positive; + default = 10; + example = 50; + description = '' + Maximum file upload size in MiB. + ''; + }; + }; + filesystem = { data = lib.mkOption { type = lib.types.path; From 85e7cee3fe2ebc59920d0b8092ab214652f82ca2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Oct 2024 00:10:04 +0200 Subject: [PATCH 53/94] pretalx.plugins.downstream: 1.3.0 -> 1.3.1 https://github.com/pretalx/pretalx-downstream/compare/v1.3.0...v1.3.1 --- pkgs/by-name/pr/pretalx/plugins/downstream.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/pretalx/plugins/downstream.nix b/pkgs/by-name/pr/pretalx/plugins/downstream.nix index ab94b50ac767..dd1465777ac2 100644 --- a/pkgs/by-name/pr/pretalx/plugins/downstream.nix +++ b/pkgs/by-name/pr/pretalx/plugins/downstream.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-downstream"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-downstream"; rev = "v${version}"; - hash = "sha256-xpacfU655vg6g1rD4uteeizj+Bll4fgI0AEddaGiCLE="; + hash = "sha256-Q9519jNKQUeNCHg3ivjYyQm1ePMxp/bhtcJAselQiiM="; }; build-system = [ setuptools ]; From bb77afb68273192497b4b32ea212824f5f8df5d6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Oct 2024 00:10:24 +0200 Subject: [PATCH 54/94] pretalx.plugins.media-ccc-de: 1.3.0 -> 1.4.0 https://github.com/pretalx/pretalx-media-ccc-de/compare/v1.3.0...v1.4.0 --- pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix b/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix index 82bcf966e7d7..c240be878ad1 100644 --- a/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix +++ b/pkgs/by-name/pr/pretalx/plugins/media-ccc-de.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-media-ccc-de"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-media-ccc-de"; rev = "v${version}"; - hash = "sha256-Cr9qbkb1VOH2EtDLSA5jmLiCnn1ICdvHnmTugCvHLc0="; + hash = "sha256-U+26hit4xXUzN8JT3WL+iGohqomX1ENb+ihM9IT1XWQ="; }; build-system = [ setuptools ]; From 4ae6e040d37246ef863418c0f14685e4e2babecd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Oct 2024 00:10:35 +0200 Subject: [PATCH 55/94] pretalx.plugins.pages: 1.5.0 -> 1.6.0 https://github.com/pretalx/pretalx-pages/compare/v1.5.0...v1.6.0 --- pkgs/by-name/pr/pretalx/plugins/pages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/pretalx/plugins/pages.nix b/pkgs/by-name/pr/pretalx/plugins/pages.nix index 67310f5387e5..76395ed666d2 100644 --- a/pkgs/by-name/pr/pretalx/plugins/pages.nix +++ b/pkgs/by-name/pr/pretalx/plugins/pages.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-pages"; - version = "1.5.0"; + version = "1.6.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-pages"; rev = "v${version}"; - hash = "sha256-wLMl+2hAJQksCyeBnXxMIFh1/Qkosm7PqByW6QxMsyg="; + hash = "sha256-9ZJSW6kdxpwHd25CuGTE4MMXylXaZKL3eAEKKdYiuXs="; }; build-system = [ setuptools ]; From 765ef49d2ffcdd9e3fcd8bb66e7edc9bda2ed995 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Oct 2024 00:10:49 +0200 Subject: [PATCH 56/94] pretalx.plugins.public-voting: 1.6.0 -> 1.7.0 https://github.com/pretalx/pretalx-public-voting/compare/v1.6.0...v1.7.0 --- pkgs/by-name/pr/pretalx/plugins/public-voting.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/pretalx/plugins/public-voting.nix b/pkgs/by-name/pr/pretalx/plugins/public-voting.nix index 0d66725c72f4..993bfd6def88 100644 --- a/pkgs/by-name/pr/pretalx/plugins/public-voting.nix +++ b/pkgs/by-name/pr/pretalx/plugins/public-voting.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-public-voting"; - version = "1.6.0"; + version = "1.7.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-public-voting"; rev = "v${version}"; - hash = "sha256-1zxJ1b2CHfV2AVAneUJxurZ0L3QoMzuBf8c2wrj7yBA="; + hash = "sha256-ei6GgPPEXv9WVhh+4U+WDFCMsT4bND9O85cPLpPWMhQ="; }; build-system = [ setuptools ]; From 7a516f6607c4925c42e5b731621508e4a8a5834d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Oct 2024 00:11:01 +0200 Subject: [PATCH 57/94] pretalx.plugins.venueless: 1.4.0 -> 1.5.0 https://github.com/pretalx/pretalx-venueless/compare/v1.4.0...v1.5.0 --- pkgs/by-name/pr/pretalx/plugins/venueless.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/pretalx/plugins/venueless.nix b/pkgs/by-name/pr/pretalx/plugins/venueless.nix index 12f98f174977..7c138f07f651 100644 --- a/pkgs/by-name/pr/pretalx/plugins/venueless.nix +++ b/pkgs/by-name/pr/pretalx/plugins/venueless.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pretalx-venueless"; - version = "1.4.0"; + version = "1.5.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-venueless"; rev = "v${version}"; - hash = "sha256-llgRa18hxVoRSwU5UH6w4sE2W5ozCZm4Btbia2y0LbE="; + hash = "sha256-1YWkyTaImnlGXZWrborvJrx8zc1FOZD/ugOik7S+fC8="; }; nativeBuildInputs = [ gettext ]; From ca52c2f09edd0165955b5bf14d9d06d63335badb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Oct 2024 00:11:13 +0200 Subject: [PATCH 58/94] pretalx.plugins.vimeo: 2.3.0 -> 2.4.0 https://github.com/pretalx/pretalx-vimeo/compare/v2.3.0...v2.4.0 --- pkgs/by-name/pr/pretalx/plugins/vimeo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/pretalx/plugins/vimeo.nix b/pkgs/by-name/pr/pretalx/plugins/vimeo.nix index a9a3d7903f78..a6037ca3e8fa 100644 --- a/pkgs/by-name/pr/pretalx/plugins/vimeo.nix +++ b/pkgs/by-name/pr/pretalx/plugins/vimeo.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-vimeo"; - version = "2.3.0"; + version = "2.4.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-vimeo"; rev = "v${version}"; - hash = "sha256-ZlF/wWD5FaC4CfYIYvcbykPajoCOotmmaY+rQ0sGAo8="; + hash = "sha256-MwAKmPQif2wLy03II1t87lIdIf2th4BteaAo5pACjLE="; }; build-system = [ setuptools ]; From 11d423c613b8e83264cc8b18f3c61192fcda1710 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Oct 2024 00:11:24 +0200 Subject: [PATCH 59/94] pretalx.plugins.youtube: 2.2.0 -> 2.3.0 https://github.com/pretalx/pretalx-youtube/compare/v2.2.0...v2.3.0 --- pkgs/by-name/pr/pretalx/plugins/youtube.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/pretalx/plugins/youtube.nix b/pkgs/by-name/pr/pretalx/plugins/youtube.nix index 8d9d008c9837..b2b89acbd6a9 100644 --- a/pkgs/by-name/pr/pretalx/plugins/youtube.nix +++ b/pkgs/by-name/pr/pretalx/plugins/youtube.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pretalx-youtube"; - version = "2.2.0"; + version = "2.3.0"; pyproject = true; src = fetchFromGitHub { owner = "pretalx"; repo = "pretalx-youtube"; rev = "v${version}"; - hash = "sha256-cTxkFSK84NRn7Z2uWYBJ2NvQ3pOsUbdZDg6XE5yswPg="; + hash = "sha256-5vQPFW0qABKQjFUvjMrtmIGEpMzLLbAOBA4GFqqBNw0="; }; build-system = [ setuptools ]; From 160bf0bba0be15578cfdc10a0159a77c6f2a5259 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Oct 2024 00:52:55 +0200 Subject: [PATCH 60/94] pretix: relax qrcode constraint --- pkgs/by-name/pr/pretix/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index ec6a4fc70f18..66540cdfff2a 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -98,6 +98,7 @@ python.pkgs.buildPythonApplication rec { "protobuf" "pyjwt" "python-bidi" + "qrcode" "requests" "sentry-sdk" ]; From 47a2622bf24aa01420c6975ba38a1d9203757b05 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Oct 2024 00:54:23 +0200 Subject: [PATCH 61/94] python312Packages.django-two-factor-auth: relax qrcode constraint and some light modernization. --- .../python-modules/django-two-factor-auth/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/django-two-factor-auth/default.nix b/pkgs/development/python-modules/django-two-factor-auth/default.nix index 1a35580d19e5..91c78393be57 100644 --- a/pkgs/development/python-modules/django-two-factor-auth/default.nix +++ b/pkgs/development/python-modules/django-two-factor-auth/default.nix @@ -29,13 +29,14 @@ buildPythonPackage rec { hash = "sha256-Sr7L3ioeofyADHb1NSgs0GmVbzX7rro7yhhG9Gq6GJE="; }; - nativeBuildInputs = [ - setuptools-scm + build-system = [ setuptools-scm ]; + + pythonRelaxDeps = [ + "django-phonenumber-field" + "qrcode" ]; - pythonRelaxDeps = [ "django-phonenumber-field" ]; - - propagatedBuildInputs = [ + dependencies = [ django django-formtools django-otp From 707acdb9bdf8e7c6d8ebbe7bdfaaa9afa90d4bff Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Oct 2024 00:55:44 +0200 Subject: [PATCH 62/94] pacu: relax qrcode constraint --- pkgs/by-name/pa/pacu/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pa/pacu/package.nix b/pkgs/by-name/pa/pacu/package.nix index 0ee1f4f1c8cc..73bf7b1a7947 100644 --- a/pkgs/by-name/pa/pacu/package.nix +++ b/pkgs/by-name/pa/pacu/package.nix @@ -28,6 +28,7 @@ python.pkgs.buildPythonApplication rec { "sqlalchemy-utils" "sqlalchemy" "pycognito" + "qrcode" "urllib3" ]; From 65d2f3c7f5b034dbaa4aebc0ac8b5611ce02ced7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Oct 2024 00:57:36 +0200 Subject: [PATCH 63/94] fdroidserver: provide setuptools for build step --- pkgs/by-name/fd/fdroidserver/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fd/fdroidserver/package.nix b/pkgs/by-name/fd/fdroidserver/package.nix index 832b2d62cc07..d8699f481089 100644 --- a/pkgs/by-name/fd/fdroidserver/package.nix +++ b/pkgs/by-name/fd/fdroidserver/package.nix @@ -48,7 +48,10 @@ python3Packages.buildPythonApplication { nativeBuildInputs = [ installShellFiles ]; - build-system = with python3Packages; [ babel ]; + build-system = with python3Packages; [ + setuptools + babel + ]; dependencies = with python3Packages; [ androguard From ffa77e9e2f7d38b8997d14e841cf4f5c8b63bb46 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Oct 2024 01:02:39 +0200 Subject: [PATCH 64/94] python312Packages.flet: relax qrcode constraint --- pkgs/development/python-modules/flet/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/flet/default.nix b/pkgs/development/python-modules/flet/default.nix index 7857ff562737..d35a99194358 100644 --- a/pkgs/development/python-modules/flet/default.nix +++ b/pkgs/development/python-modules/flet/default.nix @@ -41,6 +41,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "cookiecutter" "packaging" + "qrcode" "watchdog" "websockets" ]; From 07900c10c9a5fbc132bf1a793ce852707e559ddc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Oct 2024 01:07:16 +0200 Subject: [PATCH 65/94] weblate: relax qrcode constraint --- pkgs/by-name/we/weblate/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix index 690eba3a3b28..88133c882c42 100644 --- a/pkgs/by-name/we/weblate/package.nix +++ b/pkgs/by-name/we/weblate/package.nix @@ -44,8 +44,12 @@ python.pkgs.buildPythonApplication rec { hash = "sha256-cIwCNYXbg7l6z9OAkMAGJ783QI/nCOyrhLPURDcDv+Y="; }; - # https://github.com/WeblateOrg/weblate/commit/1cf2a423b20fcd2dde18a43277311334e38208e7 - pythonRelaxDeps = [ "rapidfuzz" ]; + pythonRelaxDeps = [ + # https://github.com/WeblateOrg/weblate/commit/9695f912b0d24ae999d9442bb49719b4bb552696 + "qrcode" + # https://github.com/WeblateOrg/weblate/commit/1cf2a423b20fcd2dde18a43277311334e38208e7 + "rapidfuzz" + ]; patches = [ # FIXME This shouldn't be necessary and probably has to do with some dependency mismatch. From a12121e081ce7d00616957dc67f88cee83fac842 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Oct 2024 02:16:44 +0200 Subject: [PATCH 66/94] powerdns-admin: provide distutils --- pkgs/applications/networking/powerdns-admin/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/powerdns-admin/default.nix b/pkgs/applications/networking/powerdns-admin/default.nix index 7029dd054165..2ee95b13dcbd 100644 --- a/pkgs/applications/networking/powerdns-admin/default.nix +++ b/pkgs/applications/networking/powerdns-admin/default.nix @@ -13,6 +13,7 @@ let python = python3; pythonDeps = with python.pkgs; [ + distutils flask flask-assets flask-login flask-sqlalchemy flask-migrate flask-seasurf flask-mail flask-session flask-session-captcha flask-sslify mysqlclient psycopg2 sqlalchemy certifi cffi configobj cryptography bcrypt requests python-ldap pyotp qrcode dnspython From 2689f6d7dc43a2b3da76ed39c03251a11e2d5d7c Mon Sep 17 00:00:00 2001 From: Artem Pelenitsyn Date: Mon, 21 Oct 2024 15:48:54 -0400 Subject: [PATCH 67/94] maintainers: add artem --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ba6458af23e0..e1b0d967984b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1817,6 +1817,13 @@ githubId = 338268; name = "Alexei Robyn"; }; + artem = { + email = "a@pelenitsyn.top"; + github = "ulysses4ever"; + githubId = 6832600; + name = "Artem Pelenitsyn"; + matrix = "@artem.types:matrix.org"; + }; artemist = { email = "me@artem.ist"; github = "artemist"; From d50cc09605071724a9cc6283a09ae11023193b7c Mon Sep 17 00:00:00 2001 From: Artem Pelenitsyn Date: Mon, 21 Oct 2024 20:53:31 -0400 Subject: [PATCH 68/94] haskellPackages: add artem as a maintainer of certain packages --- .../haskell-modules/configuration-hackage2nix/main.yaml | 5 +++++ pkgs/development/haskell-modules/hackage-packages.nix | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 15bb0c421782..af90ccd1bbbb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -196,6 +196,11 @@ package-maintainers: - hnix - hnix-store-core - hnix-store-remote + artem: + - BNFC-meta + - alex-meta + - happy-meta + - vector-hashtables arturcygan: - hevm athas: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 885e78c922d2..8439316bbc99 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1369,6 +1369,7 @@ self: { ]; description = "Deriving Parsers and Quasi-Quoters from BNF Grammars"; license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.artem ]; }) {}; "BPS" = callPackage @@ -28205,6 +28206,7 @@ self: { libraryToolDepends = [ alex happy ]; description = "Quasi-quoter for Alex lexers"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.artem ]; }) {}; "alex-prelude" = callPackage @@ -138797,6 +138799,7 @@ self: { libraryToolDepends = [ happy ]; description = "Quasi-quoter for Happy parsers"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.artem ]; }) {}; "happybara" = callPackage @@ -325853,6 +325856,7 @@ self: { ]; description = "Efficient vector-based mutable hashtables implementation"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.artem ]; }) {}; "vector-heterogenous" = callPackage From 08378ef15a4ab182701f96c0fee614b6f93189c6 Mon Sep 17 00:00:00 2001 From: Lin Xianyi Date: Tue, 22 Oct 2024 10:04:01 +0800 Subject: [PATCH 69/94] hypridle: 0.1.2 -> 0.1.3 Diff: https://github.com/hyprwm/hypridle/compare/v0.1.2...v0.1.3 Changelog: https://github.com/hyprwm/hypridle/releases/tag/v0.1.3 --- pkgs/by-name/hy/hypridle/package.nix | 34 ++++++++++++++++------------ 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/hy/hypridle/package.nix b/pkgs/by-name/hy/hypridle/package.nix index 9eea79c6b46a..9c7799fa9dc7 100644 --- a/pkgs/by-name/hy/hypridle/package.nix +++ b/pkgs/by-name/hy/hypridle/package.nix @@ -1,25 +1,27 @@ -{ lib -, stdenv -, fetchFromGitHub -, pkg-config -, cmake -, wayland -, wayland-protocols -, wayland-scanner -, hyprlang -, sdbus-cpp -, systemd +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + cmake, + hyprutils, + wayland, + wayland-protocols, + wayland-scanner, + hyprlang, + sdbus-cpp, + systemd, }: stdenv.mkDerivation (finalAttrs: { pname = "hypridle"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hypridle"; rev = "v${finalAttrs.version}"; - hash = "sha256-7Ft5WZTMIjXOGgRCf31DZBwK6RK8xkeKlD5vFXz3gII="; + hash = "sha256-4EgQyprji92cmhGaQQsw6eN6cmEkQKs0+MeD7YLgHlg="; }; nativeBuildInputs = [ @@ -30,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ hyprlang + hyprutils sdbus-cpp systemd wayland @@ -42,6 +45,9 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ iogamaster ]; mainProgram = "hypridle"; - platforms = [ "aarch64-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; }; }) From 4c6b6c0c5d1ac0ac0e81c94d020d3f89d6615931 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 22 Oct 2024 06:31:39 +0100 Subject: [PATCH 70/94] qemu: 9.1.0 -> 9.1.1 --- pkgs/applications/virtualization/qemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index c5f1191605d9..396b10250ed7 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -75,11 +75,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString nixosTestRunner "-for-vm-tests" + lib.optionalString toolsOnly "-utils" + lib.optionalString userOnly "-user"; - version = "9.1.0"; + version = "9.1.1"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-gWtwIqi6fCrDDi4M+XPoJva8yFBTOWAyEsXt6OlNeDQ="; + hash = "sha256-fcD52lSR/0SVAPMxAGOja2GfI27kVwb9CEbrN9S7qIk="; }; depsBuildBuild = [ buildPlatformStdenv.cc ] From a7f3eef2ed74c025b17497d6d82f02c66baf0540 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Oct 2024 06:06:51 +0000 Subject: [PATCH 71/94] python312Packages.sensorpush-ble: 1.6.2 -> 1.7.0 --- pkgs/development/python-modules/sensorpush-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sensorpush-ble/default.nix b/pkgs/development/python-modules/sensorpush-ble/default.nix index fb458d9d0626..ae8167759753 100644 --- a/pkgs/development/python-modules/sensorpush-ble/default.nix +++ b/pkgs/development/python-modules/sensorpush-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "sensorpush-ble"; - version = "1.6.2"; + version = "1.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "sensorpush-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-IZ2QSAHRdpDKFQYfqkcUm1o+7GaI8e50gEFRK3BV3s8="; + hash = "sha256-etsrXJn6n9yL0vhiZNnTepCcau50X0t2wPrhZ9R7XL4="; }; postPatch = '' From 84a9c957943d3e231a0b793853c5949dce95e666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 22 Oct 2024 08:59:00 +0200 Subject: [PATCH 72/94] shanggu-fonts: make installPhase more readable in https://github.com/NixOS/nixpkgs/pull/350296/files#r1809338555 I was scratching my head what is going on. --- pkgs/by-name/sh/shanggu-fonts/package.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/sh/shanggu-fonts/package.nix b/pkgs/by-name/sh/shanggu-fonts/package.nix index 1702dddba5ce..96d366dedf1f 100644 --- a/pkgs/by-name/sh/shanggu-fonts/package.nix +++ b/pkgs/by-name/sh/shanggu-fonts/package.nix @@ -23,12 +23,14 @@ let Sans = "sha256-x5z6GYsfQ+8a8W0djJTY8iutuLNYvaemIpdYh94krk0="; Serif = "sha256-3WK7vty3zZFNKkwViEsozU3qa+5hymYwXk6ta9AxmNM="; }; + + extraOutputs = builtins.attrNames source; in stdenvNoCC.mkDerivation { pname = "shanggu-fonts"; inherit version; - outputs = [ "out" ] ++ builtins.attrNames source; + outputs = [ "out" ] ++ extraOutputs; nativeBuildInputs = [ p7zip ]; @@ -49,13 +51,10 @@ stdenvNoCC.mkDerivation { mkdir -p $out/share/fonts/truetype '' + lib.strings.concatLines ( - lib.lists.forEach (builtins.attrNames source) ( - name: ('' - install -Dm444 ${name}/*.ttc -t $'' + name + ''/share/fonts/truetype - ln -s $'' + name + ''/share/fonts/truetype/*.ttc $out/share/fonts/truetype - '' - ) - ) + lib.lists.forEach extraOutputs (name: '' + install -Dm444 ${name}/*.ttc -t ${placeholder name}/share/fonts/truetype + ln -s "${placeholder name}" /share/fonts/truetype/*.ttc $out/share/fonts/truetype + '') ) + '' runHook postInstall ''; From 30b289cac193eb3560f3d1eebe2d2c99f4c17c6d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 21 Oct 2024 13:07:56 +0200 Subject: [PATCH 73/94] python312Packages.pycrdt: 0.10.3 -> 0.10.4 Diff: https://github.com/jupyter-server/pycrdt/compare/v0.10.3...0.10.4 Changelog: https://github.com/jupyter-server/pycrdt/releases/tag/0.10.4 --- .../python-modules/pycrdt/Cargo.lock | 18 +++++++++--------- .../python-modules/pycrdt/default.nix | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock index 64065cc4cdb0..8acdc7ca2112 100644 --- a/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -161,9 +161,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.159" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "lock_api" @@ -235,16 +235,16 @@ checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "proc-macro2" -version = "1.0.87" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" +checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" dependencies = [ "unicode-ident", ] [[package]] name = "pycrdt" -version = "0.10.3" +version = "0.10.4" dependencies = [ "pyo3", "yrs", @@ -365,9 +365,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "itoa", "memchr", @@ -392,9 +392,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.79" +version = "2.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index cfaae0cc4cd7..37730c78fb84 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "pycrdt"; - version = "0.10.3"; + version = "0.10.4"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pycrdt"; - rev = "refs/tags/v${version}"; - hash = "sha256-Z7u0ix9IjXaq0OKgH3Yvt5cAmAYSCyHT/ZcPLANuVzU="; + rev = "refs/tags/${version}"; + hash = "sha256-nKjXEXvEIGtwbSoabz7UBsx4nfsCgUXm+JdSL5Z/b38="; }; postPatch = '' From 0e93d25f0458c66d7326fe43334b4ff4966ee1b7 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 22 Oct 2024 09:54:50 +0200 Subject: [PATCH 74/94] python312Packages.open-clip-torch: 2.27.1 -> 2.28.0 Diff: https://github.com/mlfoundations/open_clip/compare/refs/tags/v2.27.1...v2.28.0 Changelog: https://github.com/mlfoundations/open_clip/releases/tag/v2.28.0 --- pkgs/development/python-modules/open-clip-torch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/open-clip-torch/default.nix b/pkgs/development/python-modules/open-clip-torch/default.nix index d9c9002b8998..fd90c13e6c2a 100644 --- a/pkgs/development/python-modules/open-clip-torch/default.nix +++ b/pkgs/development/python-modules/open-clip-torch/default.nix @@ -29,14 +29,14 @@ }: buildPythonPackage rec { pname = "open-clip-torch"; - version = "2.27.1"; + version = "2.28.0"; pyproject = true; src = fetchFromGitHub { owner = "mlfoundations"; repo = "open_clip"; rev = "refs/tags/v${version}"; - hash = "sha256-1wOxnpNEipA0N6o4b5JCsrAtBnGP7x+MPXmVIjfDmLI="; + hash = "sha256-wHqSADiKlRyJXf3CCrXlSj6tpVVSdO8GVsKInl+OMrc="; }; build-system = [ pdm-backend ]; From e7df6d2a3392b7845a95a999ad039f8108007bc5 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 22 Oct 2024 09:58:30 +0200 Subject: [PATCH 75/94] rye: 0.41.0 -> 0.42.0 Diff: https://github.com/mitsuhiko/rye/compare/refs/tags/0.41.0...0.42.0 Changelog: https://github.com/mitsuhiko/rye/releases/tag/0.42.0 --- pkgs/by-name/ry/rye/Cargo.lock | 2 +- pkgs/by-name/ry/rye/package.nix | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ry/rye/Cargo.lock b/pkgs/by-name/ry/rye/Cargo.lock index 615c6cb0f08b..d2a1fc0559ea 100644 --- a/pkgs/by-name/ry/rye/Cargo.lock +++ b/pkgs/by-name/ry/rye/Cargo.lock @@ -1819,7 +1819,7 @@ dependencies = [ [[package]] name = "rye" -version = "0.41.0" +version = "0.42.0" dependencies = [ "age", "anyhow", diff --git a/pkgs/by-name/ry/rye/package.nix b/pkgs/by-name/ry/rye/package.nix index e85172823324..529342dbe583 100644 --- a/pkgs/by-name/ry/rye/package.nix +++ b/pkgs/by-name/ry/rye/package.nix @@ -12,21 +12,21 @@ stdenv, darwin, + versionCheckHook, + # passthru nix-update-script, - testers, - rye, }: rustPlatform.buildRustPackage rec { pname = "rye"; - version = "0.41.0"; + version = "0.42.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "rye"; rev = "refs/tags/${version}"; - hash = "sha256-JpCa+7SwShfVM4Z+uPo7W2bCEf1QYHxClE/LgGSyFY0="; + hash = "sha256-f+yVuyoer0bn38iYR94TUKRT5VzQHDZQyowtas+QOK0="; }; cargoLock = { @@ -99,9 +99,14 @@ rustPlatform.buildRustPackage rec { "--skip=test_version" ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + doInstallCheck = true; + passthru = { updateScript = nix-update-script { }; - tests.version = testers.testVersion { package = rye; }; }; meta = { From 93b0eb60e053bffce2985f2aabe3348e5085c1b1 Mon Sep 17 00:00:00 2001 From: Heinz Deinhart Date: Tue, 22 Oct 2024 10:00:43 +0200 Subject: [PATCH 76/94] ddnet: 18.4 -> 18.6 (remove commented out patch) --- pkgs/games/ddnet/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index f899cdf8ddc1..78583f133064 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -92,13 +92,6 @@ stdenv.mkDerivation rec { Security ]); -# patches = [ -# (fetchpatch { -# url = "https://github.com/ddnet/ddnet/pull/8517/commits/c840bf45016a30e629f7684df5fab5d07b2c70d5.patch"; -# hash = "sha256-UG7pi0Xh/nAHFEF1RIyNZLewF+NFilTLARbV5oUlftc="; -# }) -# ]; - postPatch = '' substituteInPlace src/engine/shared/storage.cpp \ --replace /usr/ $out/ From eaadc9e24befaa132af0f0a21bf7ad5d4f5e1ce0 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 22 Oct 2024 03:16:11 -0500 Subject: [PATCH 77/94] docs/vim.section.md: Add note about nvimRequireCheck (#349864) We are trying to use this more often but, at the moment, it's a manual addition to overrides.nix. Add notes about the benefits of adding it and how it can help identify missing dependencies. --- doc/languages-frameworks/vim.section.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 5a9144792d19..c79fd3a55df9 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -232,6 +232,19 @@ To add a new plugin, run `nix-shell -p vimPluginsUpdater --run 'vim-plugins-upda Finally, there are some plugins that are also packaged in nodePackages because they have Javascript-related build steps, such as running webpack. Those plugins are not listed in `vim-plugin-names` or managed by `vimPluginsUpdater` at all, and are included separately in `overrides.nix`. Currently, all these plugins are related to the `coc.nvim` ecosystem of the Language Server Protocol integration with Vim/Neovim. +### Testing Neovim plugins {#testing-neovim-plugins} + +`nvimRequireCheck=MODULE` is a simple test which checks if Neovim can requires the lua module `MODULE` without errors. This is often enough to catch missing dependencies. + +This can be manually added through plugin definition overrides in the [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix). + +```nix + gitsigns-nvim = super.gitsigns-nvim.overrideAttrs { + dependencies = [ self.plenary-nvim ]; + nvimRequireCheck = "gitsigns"; + }; +``` + ### Plugin optional configuration {#vim-plugin-required-snippet} Some plugins require specific configuration to work. We choose not to From 8478b0738d4acad31990ed4ea3d6446e12fd7511 Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Tue, 22 Oct 2024 13:49:07 +0530 Subject: [PATCH 78/94] tailscale: move to by-name (#350402) Signed-off-by: Muhammad Falak R Wani --- .../default.nix => by-name/ta/tailscale/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{servers/tailscale/default.nix => by-name/ta/tailscale/package.nix} (98%) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/by-name/ta/tailscale/package.nix similarity index 98% rename from pkgs/servers/tailscale/default.nix rename to pkgs/by-name/ta/tailscale/package.nix index 466e4b93c63a..5e1b6a9babe8 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/by-name/ta/tailscale/package.nix @@ -1,6 +1,6 @@ { lib , stdenv -, buildGoModule +, buildGo123Module , fetchFromGitHub , fetchpatch , makeWrapper @@ -17,7 +17,7 @@ let version = "1.76.1"; in -buildGoModule { +buildGo123Module { pname = "tailscale"; inherit version; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e23aed3be66..d7f8ed8d05a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25154,10 +25154,6 @@ with pkgs; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; - tailscale = callPackage ../servers/tailscale { - buildGoModule = buildGo123Module; - }; - tailscale-systray = callPackage ../applications/misc/tailscale-systray { }; tailspin = callPackage ../tools/misc/tailspin { }; From ca24039865345d2e208b1b08af7fbbc67a7d1533 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Oct 2024 10:35:42 +0200 Subject: [PATCH 79/94] python312Packages.sensorpush-ble: refactor --- .../python-modules/sensorpush-ble/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/sensorpush-ble/default.nix b/pkgs/development/python-modules/sensorpush-ble/default.nix index ae8167759753..e8fb3446dd95 100644 --- a/pkgs/development/python-modules/sensorpush-ble/default.nix +++ b/pkgs/development/python-modules/sensorpush-ble/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, home-assistant-bluetooth, poetry-core, + pytest-cov-stub, pytestCheckHook, pythonOlder, sensor-state-data, @@ -16,7 +17,7 @@ buildPythonPackage rec { version = "1.7.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; @@ -25,21 +26,19 @@ buildPythonPackage rec { hash = "sha256-etsrXJn6n9yL0vhiZNnTepCcau50X0t2wPrhZ9R7XL4="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=sensorpush_ble --cov-report=term-missing:skip-covered" "" - ''; + build-system = [ poetry-core ]; - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ + dependencies = [ bluetooth-data-tools bluetooth-sensor-state-data home-assistant-bluetooth sensor-state-data ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; pythonImportsCheck = [ "sensorpush_ble" ]; From 3fe0ef1e3ca7367083bb58791ab36d5b0346d53a Mon Sep 17 00:00:00 2001 From: uku Date: Tue, 22 Oct 2024 10:59:07 +0200 Subject: [PATCH 80/94] cloudflared: 2024.9.1 -> 2024.10.0 --- pkgs/applications/networking/cloudflared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 4cd54559fb05..4c56b05da462 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2024.9.1"; + version = "2024.10.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = "refs/tags/${version}"; - hash = "sha256-PFe58tdLc6RtLFrGuL9y+FWNGIASXCDawxSG2He2IQ0="; + hash = "sha256-xCLLWe15+YmU3SyWkclzHBojHi32nUJGe4xY3NZC05M="; }; vendorHash = null; From b6bda7695752b217cf2d6a623653e5192f69c6de Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Oct 2024 11:36:34 +0200 Subject: [PATCH 81/94] python312Pakcages.dncil: init at 1.0.2 Module to disassemble Common Intermediate Language (CIL) instructions https://github.com/mandiant/dncil --- .../python-modules/dncil/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/dncil/default.nix diff --git a/pkgs/development/python-modules/dncil/default.nix b/pkgs/development/python-modules/dncil/default.nix new file mode 100644 index 000000000000..d57e491a7876 --- /dev/null +++ b/pkgs/development/python-modules/dncil/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "dncil"; + version = "1.0.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "mandiant"; + repo = "dncil"; + rev = "refs/tags/v${version}"; + hash = "sha256-bndkiXkIYTd071J+mgkmJmA+9J5yJ+9/oDfAypN7wYo="; + }; + + build-system = [ setuptools ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "dncil" ]; + + meta = { + description = "Module to disassemble Common Intermediate Language (CIL) instructions"; + homepage = "https://github.com/mandiant/dncil"; + changelog = "https://github.com/mandiant/dncil/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 61fd9424c546..5616bdfb4b48 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3624,6 +3624,8 @@ self: super: with self; { dnachisel = callPackage ../development/python-modules/dnachisel { }; + dncil = callPackage ../development/python-modules/dncil { }; + dnf-plugins-core = callPackage ../development/python-modules/dnf-plugins-core { }; dnf4 = callPackage ../development/python-modules/dnf4 { }; From e6bd3903101dacbc14819f6b3028d3edf5df1fd1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Oct 2024 11:44:09 +0200 Subject: [PATCH 82/94] python312Packages.ha-mqtt-discoverable: 0.14.0 -> 0.16.0 Diff: https://github.com/unixorn/ha-mqtt-discoverable/compare/refs/tags/v0.14.0...v0.16.0 Changelog: https://github.com/unixorn/ha-mqtt-discoverable/releases/tag/v0.16.0 --- .../python-modules/ha-mqtt-discoverable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix index 32024f892556..deff078edf85 100644 --- a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix +++ b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "ha-mqtt-discoverable"; - version = "0.14.0"; + version = "0.16.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "unixorn"; repo = "ha-mqtt-discoverable"; rev = "refs/tags/v${version}"; - hash = "sha256-vL4EzeU+8nUPyLR22MJtLhknWF4DWMo49EKvkIqIWhA="; + hash = "sha256-IdyrcqRX5YXS6tx5qP7vOnAJpvy5sOsCwFpWMdyYaeI="; }; pythonRelaxDeps = [ "pyaml" ]; From 50ea63c313a3a39d55442225ed53038dabdeb376 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Oct 2024 11:47:09 +0200 Subject: [PATCH 83/94] python312Packages.influxdb-client: 1.46.0 -> 1.47.0 Diff: https://github.com/influxdata/influxdb-client-python/compare/refs/tags/v1.46.0...v1.47.0 Changelog: https://github.com/influxdata/influxdb-client-python/blob/v1.47.0/CHANGELOG.md --- pkgs/development/python-modules/influxdb-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 9360f6d78010..712be1f3410a 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.46.0"; + version = "1.47.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-oq6VXsCizqs7ZGocFWvD6SK1HRgQerlAEDW6+SBoM+A="; + hash = "sha256-1QWy+mdVttowdbIBmtW6gYwkJ4p9sL0D+DxsHk3xgvc="; }; build-system = [ setuptools ]; From a76ccc4820dd415b872686753ad3b5dffa1381c6 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Tue, 22 Oct 2024 12:56:49 +0300 Subject: [PATCH 84/94] yt-dlp: 2024.10.7 -> 2024.10.22 Changelog: https://github.com/yt-dlp/yt-dlp/releases/tag/2024.10.22 Diff: https://github.com/yt-dlp/yt-dlp/compare/2024.10.07...2024.10.22 --- pkgs/by-name/yt/yt-dlp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix index b6dfe89c8088..3f1b836dac0c 100644 --- a/pkgs/by-name/yt/yt-dlp/package.nix +++ b/pkgs/by-name/yt/yt-dlp/package.nix @@ -17,13 +17,13 @@ python3Packages.buildPythonApplication rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2024.10.7"; + version = "2024.10.22"; pyproject = true; src = fetchPypi { inherit version; pname = "yt_dlp"; - hash = "sha256-C68atRfJdI1+M3ztkcVUPDb8FiRqnr7awy6/IMGZjOs="; + hash = "sha256-R7gqH9IkEbXJXvLwoa4a9Obf1zbqmf2yoOpBRFq8Yro="; }; build-system = with python3Packages; [ From a3f9e97d78566a4b777560b9654f3778a1db6886 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 21 Oct 2024 20:47:53 +0200 Subject: [PATCH 85/94] crosvm: 128.1 -> 129.0 Backported patch that fixes cross domain being completely non-functional. --- .../virtualization/crosvm/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index c36ed736176a..10168a6d75c5 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchgit +{ lib, rustPlatform, fetchgit, fetchpatch , pkg-config, protobuf, python3, wayland-scanner , libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols , pkgsCross @@ -6,18 +6,27 @@ rustPlatform.buildRustPackage rec { pname = "crosvm"; - version = "128.1"; + version = "129.0"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "57702acf01cbd0e560e058dc97d22378d0c49ecc"; - hash = "sha256-lQStmmTxMC9Iq6vJxJMFIUUtaixJNGuBfAvBo9KKrjU="; + rev = "b7fd753b43baf2da422a1fe5e2c6d05180f7cd0b"; + hash = "sha256-y1PlqX6ghCet2SdtS/M2rXy58mHyHMLOxy3OrcoHSJk="; fetchSubmodules = true; }; + patches = [ + (fetchpatch { + name = "cross-domain.patch"; + url = "https://chromium.googlesource.com/chromiumos/platform/crosvm/+/60053cdf0b360a03084292b39120365fff65d410%5E%21/?format=TEXT"; + decode = "base64 -d"; + hash = "sha256-U5eOxuAtVLjJ+8h16lmbJYNxsP/AOEv/1ec4WlUxP2E="; + }) + ]; + separateDebugInfo = true; - cargoHash = "sha256-qKCO9Rkk04HznExgYKJgpssZDjWfhsY2XOBifvtHFos="; + cargoHash = "sha256-zQ2Y0/xjnHN75nX0Awigrh9Cnuh8N47XwDhq+ZLITDg="; nativeBuildInputs = [ pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner From 6db0f02efcbf80b8e6c16e007917a730ec3e1179 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 21 Oct 2024 20:52:04 +0200 Subject: [PATCH 86/94] crosvm.updateScript: update cargoHash --- pkgs/applications/virtualization/crosvm/update.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/crosvm/update.py b/pkgs/applications/virtualization/crosvm/update.py index 62e195d3426f..92444d287478 100755 --- a/pkgs/applications/virtualization/crosvm/update.py +++ b/pkgs/applications/virtualization/crosvm/update.py @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -p common-updater-scripts python3 +#! nix-shell -p common-updater-scripts nix-update python3 #! nix-shell -i python import csv @@ -52,3 +52,6 @@ with urlopen(f'https://chromium.googlesource.com/chromiumos/platform/crosvm/+log # Update the version, git revision, and hash in crosvm's default.nix. subprocess.run(['update-source-version', 'crosvm', f'--rev={rev}', version]) + +# Update cargoHash. +subprocess.run(['nix-update', '--version=skip', 'crosvm']) From a60d8c940cadafb7a33ac415b8b2718bb6d82766 Mon Sep 17 00:00:00 2001 From: Astro Date: Thu, 5 Sep 2024 14:05:33 +0200 Subject: [PATCH 87/94] alioth: init at 0.5.0 --- pkgs/by-name/al/alioth/package.nix | 36 ++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/al/alioth/package.nix diff --git a/pkgs/by-name/al/alioth/package.nix b/pkgs/by-name/al/alioth/package.nix new file mode 100644 index 000000000000..02bb4f39924a --- /dev/null +++ b/pkgs/by-name/al/alioth/package.nix @@ -0,0 +1,36 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "alioth"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "google"; + repo = "alioth"; + rev = "refs/tags/v${version}"; + hash = "sha256-K0Hx6EJYyPJZA+FLIj44BtUuZZOqWW2DUJt1QbeZyu0="; + }; + + # Checks use `debug_assert_eq!` + checkType = "debug"; + + cargoHash = "sha256-J+1SXHQJJxT0qN/ELAvwQFnKCo13ZrQClpbfleM4PkA="; + + separateDebugInfo = true; + + meta = with lib; { + homepage = "https://github.com/google/alioth"; + description = "Experimental Type-2 Hypervisor in Rust implemented from scratch"; + license = licenses.asl20; + mainProgram = "alioth"; + maintainers = with maintainers; [ astro ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; + }; +} From b12bcabd244ff468d7f5ecf4aec4af28e9c7098d Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Tue, 22 Oct 2024 12:32:03 +0200 Subject: [PATCH 88/94] maintainers: remove erictapen from packages that I don't really maintain anymore --- nixos/modules/services/networking/smokeping.nix | 5 +---- nixos/modules/services/security/kanidm.nix | 1 - nixos/tests/kanidm.nix | 2 +- pkgs/applications/graphics/ImageMagick/default.nix | 2 +- pkgs/applications/video/mapmap/default.nix | 2 +- pkgs/by-name/ka/kanidm/package.nix | 2 +- pkgs/development/libraries/libexif/default.nix | 2 +- pkgs/games/factorio/default.nix | 2 +- pkgs/tools/networking/smokeping/default.nix | 2 +- 9 files changed, 8 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index d9c314f5ec64..f96853939bd2 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -375,8 +375,5 @@ in }; }; - meta.maintainers = with lib.maintainers; [ - erictapen - nh2 - ]; + meta.maintainers = with lib.maintainers; [ nh2 ]; } diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix index cf2fffac3f5d..845a6703dcfb 100644 --- a/nixos/modules/services/security/kanidm.nix +++ b/nixos/modules/services/security/kanidm.nix @@ -979,7 +979,6 @@ in }; meta.maintainers = with lib.maintainers; [ - erictapen Flakebi oddlama ]; diff --git a/nixos/tests/kanidm.nix b/nixos/tests/kanidm.nix index 7e2fce20857a..5cb298fe9243 100644 --- a/nixos/tests/kanidm.nix +++ b/nixos/tests/kanidm.nix @@ -16,7 +16,7 @@ import ./make-test-python.nix ({ pkgs, ... }: in { name = "kanidm"; - meta.maintainers = with pkgs.lib.maintainers; [ erictapen Flakebi oddlama ]; + meta.maintainers = with pkgs.lib.maintainers; [ Flakebi oddlama ]; nodes.server = { pkgs, ... }: { services.kanidm = { diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 8625f305689e..aa613ef09ae9 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -146,7 +146,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Software suite to create, edit, compose, or convert bitmap images"; pkgConfigModules = [ "ImageMagick" "MagickWand" ]; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ erictapen dotlambda rhendric ]; + maintainers = with maintainers; [ dotlambda rhendric ]; license = licenses.asl20; mainProgram = "magick"; }; diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix index 39904f829159..66e670d05343 100644 --- a/pkgs/applications/video/mapmap/default.nix +++ b/pkgs/applications/video/mapmap/default.nix @@ -71,7 +71,7 @@ mkDerivation rec { description = "Open source video mapping software"; homepage = "https://github.com/mapmapteam/mapmap"; license = licenses.gpl3; - maintainers = [ maintainers.erictapen ]; + maintainers = [ ]; platforms = platforms.linux; mainProgram = "mapmap"; }; diff --git a/pkgs/by-name/ka/kanidm/package.nix b/pkgs/by-name/ka/kanidm/package.nix index cfa9e43ba7ff..c2972b0778ed 100644 --- a/pkgs/by-name/ka/kanidm/package.nix +++ b/pkgs/by-name/ka/kanidm/package.nix @@ -131,6 +131,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/kanidm/kanidm"; license = licenses.mpl20; platforms = platforms.linux; - maintainers = with maintainers; [ adamcstephens erictapen Flakebi ]; + maintainers = with maintainers; [ adamcstephens Flakebi ]; }; } diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix index 8b9e889d3e2b..4130c54eba3d 100644 --- a/pkgs/development/libraries/libexif/default.nix +++ b/pkgs/development/libraries/libexif/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "Library to read and manipulate EXIF data in digital photographs"; license = licenses.lgpl21; platforms = platforms.unix; - maintainers = with maintainers; [ erictapen ]; + maintainers = [ ]; }; } diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 4775ba5b1635..8dd35b1e4b63 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -198,7 +198,7 @@ let homepage = "https://www.factorio.com/"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ Baughn elitak erictapen priegger lukegb ]; + maintainers = with lib.maintainers; [ Baughn elitak priegger lukegb ]; platforms = [ "x86_64-linux" ]; mainProgram = "factorio"; }; diff --git a/pkgs/tools/networking/smokeping/default.nix b/pkgs/tools/networking/smokeping/default.nix index 29996a1c7243..bfae54dc3522 100644 --- a/pkgs/tools/networking/smokeping/default.nix +++ b/pkgs/tools/networking/smokeping/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://oss.oetiker.ch/smokeping"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; - maintainers = [ lib.maintainers.erictapen ]; + maintainers = [ ]; }; } From ac156c8a50d57b103ab4f9c3ad32767fe6d23a4d Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Tue, 22 Oct 2024 19:25:14 +0800 Subject: [PATCH 89/94] cantor: nixfmt --- pkgs/applications/kde/cantor.nix | 157 +++++++++++++++++-------------- 1 file changed, 86 insertions(+), 71 deletions(-) diff --git a/pkgs/applications/kde/cantor.nix b/pkgs/applications/kde/cantor.nix index 1805ed8a5234..d98b4e8d6181 100644 --- a/pkgs/applications/kde/cantor.nix +++ b/pkgs/applications/kde/cantor.nix @@ -1,46 +1,55 @@ -{ lib -, mkDerivation +{ + lib, + mkDerivation, -, cmake -, extra-cmake-modules -, makeWrapper -, shared-mime-info + cmake, + extra-cmake-modules, + makeWrapper, + shared-mime-info, -, qtbase -, qtsvg -, qttools -, qtwebengine -, qtxmlpatterns + qtbase, + qtsvg, + qttools, + qtwebengine, + qtxmlpatterns, -, poppler + poppler, -, karchive -, kcompletion -, kconfig -, kcoreaddons -, kcrash -, kdoctools -, ki18n -, kiconthemes -, kio -, knewstuff -, kparts -, kpty -, ktexteditor -, ktextwidgets -, kxmlgui -, syntax-highlighting + karchive, + kcompletion, + kconfig, + kcoreaddons, + kcrash, + kdoctools, + ki18n, + kiconthemes, + kio, + knewstuff, + kparts, + kpty, + ktexteditor, + ktextwidgets, + kxmlgui, + syntax-highlighting, -, libspectre + libspectre, -# Backends. Set to null if you want to omit from the build -, withAnalitza ? true, analitza -, wtihJulia ? true, julia -, withQalculate ? true, libqalculate -, withLua ? true, luajit -, withPython ? true, python3 -, withR ? true, R -, withSage ? true, sage, sage-with-env ? sage.with-env + # Backends. Set to null if you want to omit from the build + withAnalitza ? true, + analitza, + wtihJulia ? true, + julia, + withQalculate ? true, + libqalculate, + withLua ? true, + luajit, + withPython ? true, + python3, + withR ? true, + R, + withSage ? true, + sage, + sage-with-env ? sage.with-env, }: mkDerivation { @@ -54,42 +63,42 @@ mkDerivation { qttools ]; - buildInputs = [ - qtbase - qtsvg - qtwebengine - qtxmlpatterns + buildInputs = + [ + qtbase + qtsvg + qtwebengine + qtxmlpatterns - poppler + poppler - karchive - kcompletion - kconfig - kcoreaddons - kcrash - kdoctools - ki18n - kiconthemes - kio - knewstuff - kparts - kpty - ktexteditor - ktextwidgets - kxmlgui - syntax-highlighting + karchive + kcompletion + kconfig + kcoreaddons + kcrash + kdoctools + ki18n + kiconthemes + kio + knewstuff + kparts + kpty + ktexteditor + ktextwidgets + kxmlgui + syntax-highlighting - libspectre - ] - # backends - ++ lib.optional withAnalitza analitza - ++ lib.optional wtihJulia julia - ++ lib.optional withQalculate libqalculate - ++ lib.optional withLua luajit - ++ lib.optional withPython python3 - ++ lib.optional withR R - ++ lib.optional withSage sage-with-env - ; + libspectre + ] + # backends + ++ lib.optional withAnalitza analitza + ++ lib.optional wtihJulia julia + ++ lib.optional withQalculate libqalculate + ++ lib.optional withLua luajit + ++ lib.optional withPython python3 + ++ lib.optional withR R + ++ lib.optional withSage sage-with-env; qtWrapperArgs = [ "--prefix PATH : ${placeholder "out"}/bin" @@ -101,7 +110,13 @@ mkDerivation { meta = with lib; { description = "Front end to powerful mathematics and statistics packages"; homepage = "https://cantor.kde.org/"; - license = with licenses; [ bsd3 cc0 gpl2Only gpl2Plus gpl3Only ]; + license = with licenses; [ + bsd3 + cc0 + gpl2Only + gpl2Plus + gpl3Only + ]; maintainers = with maintainers; [ hqurve ]; }; } From a8d211376f8e50202cf608751fa59f2c47565d1f Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Tue, 22 Oct 2024 20:00:16 +0800 Subject: [PATCH 90/94] cantor: fix build --- pkgs/applications/kde/cantor.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/kde/cantor.nix b/pkgs/applications/kde/cantor.nix index d98b4e8d6181..6af2b207ed41 100644 --- a/pkgs/applications/kde/cantor.nix +++ b/pkgs/applications/kde/cantor.nix @@ -7,6 +7,7 @@ makeWrapper, shared-mime-info, + fetchpatch, qtbase, qtsvg, qttools, @@ -107,16 +108,24 @@ mkDerivation { # Causes failures on Hydra and ofborg from some reason enableParallelBuilding = false; - meta = with lib; { + patches = [ + # fix build for julia 1.1 from upstream + (fetchpatch { + url = "https://github.com/KDE/cantor/commit/ed9525ec7895c2251668d11218f16f186db48a59.patch?full_index=1"; + hash = "sha256-paq0e7Tl2aiUjBf1bDHLLUpShwdCQLICNTPNsXSoe5M="; + }) + ]; + + meta = { description = "Front end to powerful mathematics and statistics packages"; homepage = "https://cantor.kde.org/"; - license = with licenses; [ + license = with lib.licenses; [ bsd3 cc0 gpl2Only gpl2Plus gpl3Only ]; - maintainers = with maintainers; [ hqurve ]; + maintainers = with lib.maintainers; [ hqurve ]; }; } From f4f938ad86e2e795186463a89ae7508eb9e5144b Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 22 Oct 2024 14:27:02 +0200 Subject: [PATCH 91/94] maintainers: update rnhmjoj --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8caa9a5de0fd..3e479f307d96 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18338,7 +18338,7 @@ }; rnhmjoj = { email = "rnhmjoj@inventati.org"; - matrix = "@rnhmjoj:maxwell.ydns.eu"; + matrix = "@rnhmjoj:eurofusion.eu"; github = "rnhmjoj"; githubId = 2817565; name = "Michele Guerini Rocco"; From 50432e13ae3d6f8a9967d6d2455a58e50fc5df67 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Tue, 22 Oct 2024 20:33:33 +0800 Subject: [PATCH 92/94] home-assistant-custom-components.*: Add missing lib.recurseIntoAttrs Fixup commit 08eee7bd7ae2eb1278d08416740c709bd796f26c, so hydra build home-assistant-custom-components.* again. --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e98f6f318436..b952b4d085c9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24313,10 +24313,10 @@ with pkgs; home-assistant = callPackage ../servers/home-assistant { }; buildHomeAssistantComponent = callPackage ../servers/home-assistant/build-custom-component { }; - home-assistant-custom-components = lib.packagesFromDirectoryRecursive { + home-assistant-custom-components = lib.recurseIntoAttrs (lib.packagesFromDirectoryRecursive { inherit (home-assistant.python.pkgs) callPackage; directory = ../servers/home-assistant/custom-components; - }; + }); home-assistant-custom-lovelace-modules = lib.recurseIntoAttrs (callPackage ../servers/home-assistant/custom-lovelace-modules {}); From da2060c0dee86a677096aab104c029a578bd12ea Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 22 Oct 2024 14:54:41 +0200 Subject: [PATCH 93/94] drawio: update license Link: https://github.com/jgraph/drawio/discussions/4623 --- pkgs/applications/graphics/drawio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index a0c1776a6971..4a711fe0ade2 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Desktop application for creating diagrams"; homepage = "https://about.draw.io/"; - license = licenses.asl20; + license = licenses.unfree; changelog = "https://github.com/jgraph/drawio-desktop/releases/tag/v${version}"; maintainers = with maintainers; [ qyliss darkonion0 ]; platforms = platforms.darwin ++ platforms.linux; From 564ef796a24f201ee1bbcdf2a8c2e1412b2c5c3f Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 22 Oct 2024 14:54:57 +0200 Subject: [PATCH 94/94] drawio: drop maintainership --- pkgs/applications/graphics/drawio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 4a711fe0ade2..5b551da388dc 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { homepage = "https://about.draw.io/"; license = licenses.unfree; changelog = "https://github.com/jgraph/drawio-desktop/releases/tag/v${version}"; - maintainers = with maintainers; [ qyliss darkonion0 ]; + maintainers = with maintainers; [ darkonion0 ]; platforms = platforms.darwin ++ platforms.linux; mainProgram = "drawio"; };