From 3c2efe61dc6a6919e667bf70616da7819352431f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 27 Oct 2023 16:08:20 +0200 Subject: [PATCH 01/95] docs/installation-usb: add more flags to dd oflag=direct is faster for writing because it by-passes the page cache status=progress shows speed and progress --- nixos/doc/manual/installation/installing-usb.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/installation/installing-usb.section.md b/nixos/doc/manual/installation/installing-usb.section.md index adfe22ea2f00..3b9e2f492f04 100644 --- a/nixos/doc/manual/installation/installing-usb.section.md +++ b/nixos/doc/manual/installation/installing-usb.section.md @@ -35,7 +35,7 @@ select the image, select the USB flash drive and click "Write". 4. Then use the `dd` utility to write the image to the USB flash drive. ```ShellSession - sudo dd if= of=/dev/sdX bs=4M conv=fsync + sudo dd bs=4M conv=fsync oflag=direct status=progress if= of=/dev/sdX ``` ## Creating bootable USB flash drive from a Terminal on macOS {#sec-booting-from-usb-macos} From 2b816ea9b9065328de6b5cddac98af4fe6fc2dcd Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 22 Nov 2023 00:18:28 +0100 Subject: [PATCH 02/95] cudaPackages.fabricmanager: deprecate phases --- pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix b/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix index 58cf8c0e3557..92f389e5dc91 100644 --- a/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix +++ b/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { "${sys}/${pname}-${sys}-${fmver}-archive.tar.xz"; inherit sha256; }; - phases = [ "unpackPhase" "installPhase" ]; installPhase = '' find . From 4a4e3f6d4e398979fc9e743b0d7b827bebb43e38 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Fri, 29 Dec 2023 10:57:56 +0100 Subject: [PATCH 03/95] nixos/tests/prowlarr: check fo folder existance --- nixos/tests/prowlarr.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/tests/prowlarr.nix b/nixos/tests/prowlarr.nix index af669afd5700..663743546459 100644 --- a/nixos/tests/prowlarr.nix +++ b/nixos/tests/prowlarr.nix @@ -11,6 +11,8 @@ import ./make-test-python.nix ({ lib, ... }: testScript = '' machine.wait_for_unit("prowlarr.service") machine.wait_for_open_port(9696) - machine.succeed("curl --fail http://localhost:9696/") + response = machine.succeed("curl --fail http://localhost:9696/") + assert 'Prowlarr' in response, "Login page didn't load successfully" + machine.succeed("[ -d /var/lib/prowlarr ]") ''; }) From a41c9c0e8444b2098fd34029f953790a075634a0 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 31 Dec 2023 09:46:33 +0000 Subject: [PATCH 04/95] valhalla: fix `tests` eval Without the change `pkgConfigModules` test fails to evaluate as: $ nix build --no-link -f. valhalla.tests error: error: attribute 'pkgConfigModules' missing --- pkgs/development/libraries/valhalla/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/valhalla/default.nix b/pkgs/development/libraries/valhalla/default.nix index bfd23747db0a..b3cb46fe910e 100644 --- a/pkgs/development/libraries/valhalla/default.nix +++ b/pkgs/development/libraries/valhalla/default.nix @@ -88,6 +88,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://valhalla.readthedocs.io/"; license = licenses.mit; maintainers = [ maintainers.Thra11 ]; + pkgConfigModules = [ "libvalhalla" ]; platforms = platforms.linux; }; }) From 009b9850779197dba8b7e849d303f93be307536f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 1 Jan 2024 10:16:58 +0000 Subject: [PATCH 05/95] aaxtomp3: fix eval for non-glibc targets Without the change the eval fails as: $ nix build --no-link -f. pkgsCross.aarch64-android.aaxtomp3 error: error: cannot coerce null to a string --- pkgs/development/misc/resholve/oildev.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/misc/resholve/oildev.nix b/pkgs/development/misc/resholve/oildev.nix index 2459c492ebc0..92c3828abfc1 100644 --- a/pkgs/development/misc/resholve/oildev.nix +++ b/pkgs/development/misc/resholve/oildev.nix @@ -10,7 +10,7 @@ git , # oil deps file -, glibcLocales +, pkgsBuildBuild , six , typing }: @@ -123,7 +123,7 @@ rec { ''; # See earlier note on glibcLocales TODO: verify needed? - LOCALE_ARCHIVE = lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${pkgsBuildBuild.glibcLocales}/lib/locale/locale-archive"; # not exhaustive; sample what resholve uses as a sanity check pythonImportsCheck = [ From 436f194a7659efa62ac6f7cba57803c531f5d79d Mon Sep 17 00:00:00 2001 From: Tomo <68489118+Tomodachi94@users.noreply.github.com> Date: Tue, 2 Jan 2024 22:42:21 -0800 Subject: [PATCH 06/95] craftos-pc: 2.7.5 -> 2.8 Changelog: https://github.com/MCJack123/craftos2/releases/tag/v2.8 This release contains several breaking changes, and should **not** be backported. --- .../manual/release-notes/rl-2405.section.md | 6 +++++ .../emulators/craftos-pc/default.nix | 23 +++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index b347992031d9..36a645db4ebb 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -61,6 +61,12 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - The `kanata` package has been updated to v1.5.0, which includes [breaking changes](https://github.com/jtroo/kanata/releases/tag/v1.5.0). +- The `craftos-pc` package has been updated to v2.8, which includes [breaking changes](https://github.com/MCJack123/craftos2/releases/tag/v2.8). + - Files are now handled in binary mode; this could break programs with embedded UTF-8 characters. + - The ROM was updated to match ComputerCraft version v1.109.2. + - The bundled Lua was updated to Lua v5.2, which includes breaking changes. See the [Lua manual](https://www.lua.org/manual/5.2/manual.html#8) for more information. + - The WebSocket API [was rewritten](https://github.com/MCJack123/craftos2/issues/337), which introduced breaking changes. + - The latest available version of Nextcloud is v28 (available as `pkgs.nextcloud28`). The installation logic is as follows: - If [`services.nextcloud.package`](#opt-services.nextcloud.package) is specified explicitly, this package will be installed (**recommended**) - If [`system.stateVersion`](#opt-system.stateVersion) is >=24.05, `pkgs.nextcloud28` will be installed by default. diff --git a/pkgs/applications/emulators/craftos-pc/default.nix b/pkgs/applications/emulators/craftos-pc/default.nix index b147af8d02b7..9c1c31c689ca 100644 --- a/pkgs/applications/emulators/craftos-pc/default.nix +++ b/pkgs/applications/emulators/craftos-pc/default.nix @@ -16,17 +16,17 @@ }: let - version = "2.7.5"; + version = "2.8"; craftos2-lua = fetchFromGitHub { owner = "MCJack123"; repo = "craftos2-lua"; rev = "v${version}"; - hash = "sha256-JMBsSoO/yTLw7K1Ri3BzKr5bz5UirXiPr/Q0YoMumhY="; + hash = "sha256-xuNcWt3Wnh3WlYe6pB4dvP3PY9S5ghL9QQombGn8iyY="; }; craftos2-rom = fetchFromGitHub { owner = "McJack123"; repo = "craftos2-rom"; - rev = "v${version}.1"; # Author released a hotfix; remove trailing '.1' on next update + rev = "v${version}"; hash = "sha256-WZs/KIdpqLLzvpH2hiJpe/AehluoQMtewBbAb4htz8k="; }; in @@ -39,9 +39,18 @@ stdenv.mkDerivation rec { owner = "MCJack123"; repo = "craftos2"; rev = "v${version}"; - hash = "sha256-t2yhSuNPFCF2NaQFWuN9Nos5ZPinAvecV6EZNO0Cy9I="; + hash = "sha256-nT/oN2XRU1Du1/IHlkRCzLqFwQ5s9Sr4FQs3ES+aPFs="; }; + patches = [ + ( # Fixes CCEmuX. This is a one-character change that did not make it into the release. + fetchpatch { + url = "https://github.com/MCJack123/craftos2/commit/9ef7e16b69ead69b5fe076724842a1e24b3de058.patch"; + hash = "sha256-SjNnsooDFt3JoVOO0xf6scrGXEQQmrQf91GY7VWaTOw="; + } + ) + ]; + buildInputs = [ patchelf poco openssl SDL2 SDL2_mixer ncurses libpng pngpp libwebp ]; preBuild = '' @@ -50,6 +59,12 @@ stdenv.mkDerivation rec { make -C craftos2-lua linux ''; + buildPhase = '' + runHook preBuild + make + runHook postBuild + ''; + dontStrip = true; installPhase = '' From ce2410cf0c5f16e9a4c2dac2bb1d5431719ad7fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Jan 2024 05:22:46 +0000 Subject: [PATCH 07/95] dune_3: 3.12.1 -> 3.12.2 --- pkgs/development/tools/ocaml/dune/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index 97ffb9eb941f..595ba9c9da5b 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.12.1"; + version = "3.12.2"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - hash = "sha256-uf1lYIefnTQK6Kh8lnsNK808QSDP/Nn7Zh8yUHj3T28="; + hash = "sha256-6KpfAf7oPvrIcz3wvsPiOq7NtFJLxYuAZc0YzAcpX7M="; }; nativeBuildInputs = [ ocaml findlib ]; From ba50ad471f9aae1b086d503918cfdd8905d79153 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 8 Jan 2024 02:50:55 -0500 Subject: [PATCH 08/95] oxlint: 0.0.18 -> 0.1.2 Diff: https://github.com/web-infra-dev/oxc/compare/oxlint_v0.0.18...oxlint_v0.1.2 Changelog: https://github.com/web-infra-dev/oxc/releases/tag/oxlint_v0.1.2 --- pkgs/development/tools/oxlint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/oxlint/default.nix b/pkgs/development/tools/oxlint/default.nix index ecc1ab9cc7c6..54bbc4e27a92 100644 --- a/pkgs/development/tools/oxlint/default.nix +++ b/pkgs/development/tools/oxlint/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "oxlint"; - version = "0.0.18"; + version = "0.1.2"; src = fetchFromGitHub { owner = "web-infra-dev"; repo = "oxc"; rev = "oxlint_v${version}"; - hash = "sha256-WvNPfEgeBBbzhyJsMPpqhhkZ8GRn3mCq7HVaoVrCm2U="; + hash = "sha256-XQDkNfgqjfUSDwC3JgdzCqYT4O14UWGImpk5gVyQKfE="; }; - cargoHash = "sha256-nWaa3JzACy6ftfm/qEfdBOxK3j4QJof7MtFI8GIpUxY="; + cargoHash = "sha256-pJW7191gUv3Sbp8C2IYxJz2G/nunmBnnKaV+yLX1ZKc="; buildInputs = [ rust-jemalloc-sys From f5888649c09b642f4e8d6ac7c1284313ab0a1b1b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 7 Jan 2024 16:09:05 +0100 Subject: [PATCH 09/95] python311Packages.pyqt5-sip: rename from pyqt5_sip --- pkgs/applications/misc/dupeguru/default.nix | 2 +- pkgs/applications/misc/onthespot/default.nix | 2 +- pkgs/applications/networking/firewalld/default.nix | 2 +- pkgs/applications/science/chemistry/pymol/default.nix | 2 +- pkgs/development/python-modules/pyqt/5.x.nix | 8 ++++---- pkgs/misc/drivers/hplip/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index 36fa71b1d9c7..4613f86ea0e2 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { pythonPath = with python3Packages; [ pyqt5 - pyqt5_sip + pyqt5-sip send2trash sphinx polib diff --git a/pkgs/applications/misc/onthespot/default.nix b/pkgs/applications/misc/onthespot/default.nix index 2a37f90d3bf3..75ae769d33ff 100644 --- a/pkgs/applications/misc/onthespot/default.nix +++ b/pkgs/applications/misc/onthespot/default.nix @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { protobuf pyogg pyqt5 - pyqt5_sip + pyqt5-sip pyxdg requests setuptools diff --git a/pkgs/applications/networking/firewalld/default.nix b/pkgs/applications/networking/firewalld/default.nix index 0af5c0c9caac..c96ca72fdfa3 100644 --- a/pkgs/applications/networking/firewalld/default.nix +++ b/pkgs/applications/networking/firewalld/default.nix @@ -26,7 +26,7 @@ let pygobject3 ] ++ lib.optionals withGui [ pyqt5 - pyqt5_sip + pyqt5-sip ]); in stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index 155d521549e3..553e82eed8fb 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -58,7 +58,7 @@ python3Packages.buildPythonApplication rec { postInstall = with python3Packages; '' wrapProgram $out/bin/pymol \ - --prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" python3.sitePackages [ pyqt5 pyqt5.pyqt5_sip ]} + --prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" python3.sitePackages [ pyqt5 pyqt5.pyqt5-sip ]} mkdir -p "$out/share/icons/" ln -s ../../lib/python/pymol/pymol_path/data/pymol/icons/icon2.svg "$out/share/icons/pymol.svg" diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index c514b9f83584..0b2b1c8ad6b1 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -9,7 +9,7 @@ , lndir , dbus-python , sip -, pyqt5_sip +, pyqt5-sip , pyqt-builder , libsForQt5 , enableVerbose ? true @@ -41,7 +41,7 @@ buildPythonPackage rec { # Fix some wrong assumptions by ./project.py # TODO: figure out how to send this upstream ./pyqt5-fix-dbus-mainloop-support.patch - # confirm license when installing via pyqt5_sip + # confirm license when installing via pyqt5-sip ./pyqt5-confirm-license.patch ]; @@ -158,11 +158,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ dbus-python - pyqt5_sip + pyqt5-sip ]; passthru = { - inherit sip pyqt5_sip; + inherit sip pyqt5-sip; multimediaEnabled = withMultimedia; webKitEnabled = withWebKit; WebSocketsEnabled = withWebSockets; diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 577cb3ecf8e3..eb221483d5bc 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -87,7 +87,7 @@ python3Packages.buildPythonApplication { distro ] ++ lib.optionals withQt5 [ pyqt5 - pyqt5_sip + pyqt5-sip enum-compat ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index fcc3497480b0..eae0dc5bf906 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -341,6 +341,7 @@ mapAliases ({ pymyq = python-myq; # added 2023-10-20 python-myq = throw "python-myq has been removed, as the service provider has decided to block its API requests"; # added 2023-12-07 pyqt4 = throw "pyqt4 has been removed, because it depended on the long EOL qt4"; # added 2022-06-09 + pyqt5_sip = pyqt5-sip; # added 2024-01-07 pyqt5_with_qtwebkit = pyqt5-webkit; # added 2024-01-07 pyramid_beaker = pyramid-beaker; # added 2023-08-23 pyramid_chameleon = pyramid-chameleon; # added 2023-08-23 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 35c07c5c5a50..d3611645ad17 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10985,7 +10985,7 @@ self: super: with self; { pyqt5-stubs = callPackage ../development/python-modules/pyqt5-stubs { }; - pyqt5_sip = callPackage ../development/python-modules/pyqt/sip.nix { }; + pyqt5-sip = callPackage ../development/python-modules/pyqt/sip.nix { }; pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; From a69b0e8a684916ba0dc9606048518e9753a7888d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 7 Jan 2024 14:11:10 +0100 Subject: [PATCH 10/95] python311Packages.sip4: rename from sip_4 --- pkgs/applications/misc/openlp/lib.nix | 4 ++-- pkgs/applications/networking/gns3/gui.nix | 2 +- .../science/machine-learning/labelimg/default.nix | 2 +- pkgs/applications/video/openshot-qt/default.nix | 2 +- pkgs/development/python-modules/libarcus/default.nix | 4 ++-- pkgs/development/python-modules/libsavitar/default.nix | 4 ++-- pkgs/development/python-modules/pynest2d/default.nix | 4 ++-- pkgs/misc/drivers/hplip/default.nix | 2 +- pkgs/misc/frescobaldi/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 11 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/misc/openlp/lib.nix b/pkgs/applications/misc/openlp/lib.nix index bf58f18fb3c3..ea22f54ac022 100644 --- a/pkgs/applications/misc/openlp/lib.nix +++ b/pkgs/applications/misc/openlp/lib.nix @@ -5,7 +5,7 @@ # python deps , python, buildPythonPackage , alembic, beautifulsoup4, chardet, lxml, mako, pyenchant -, pyqt5-webkit, pyxdg, sip_4, sqlalchemy, sqlalchemy-migrate +, pyqt5-webkit, pyxdg, sip4, sqlalchemy, sqlalchemy-migrate }: buildPythonPackage rec { @@ -41,7 +41,7 @@ buildPythonPackage rec { pyenchant pyqt5-webkit pyxdg - sip_4 + sip4 sqlalchemy sqlalchemy-migrate ]; diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 67a60559d99d..218334bbd92f 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { psutil sentry-sdk setuptools - sip_4 (pyqt5.override { withWebSockets = true; }) + sip4 (pyqt5.override { withWebSockets = true; }) truststore qt5.qtwayland ] ++ lib.optionals (pythonOlder "3.9") [ diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix index 620ccfb084ef..23703ed09952 100644 --- a/pkgs/applications/science/machine-learning/labelimg/default.nix +++ b/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -15,7 +15,7 @@ propagatedBuildInputs = with python3Packages; [ pyqt5 lxml - sip_4 + sip4 ]; preBuild = '' make qt5py3 diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 5c9b85e1f680..089b60a3b27c 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -41,7 +41,7 @@ mkDerivationWith python3.pkgs.buildPythonApplication { pyqtwebengine pyzmq requests - sip_4 + sip4 ]; strictDeps = true; diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 0230e68007de..b95c2b295257 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, python, fetchFromGitHub , fetchpatch -, cmake, sip_4, protobuf, pythonOlder }: +, cmake, sip4, protobuf, pythonOlder }: buildPythonPackage rec { pname = "libarcus"; @@ -25,7 +25,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.4"; - propagatedBuildInputs = [ sip_4 ]; + propagatedBuildInputs = [ sip4 ]; nativeBuildInputs = [ cmake ]; buildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index 83b3e129ea39..56ce67110b90 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip_4 }: +{ lib, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip4 }: buildPythonPackage rec { pname = "libsavitar"; @@ -18,7 +18,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ sip_4 ]; + propagatedBuildInputs = [ sip4 ]; disabled = pythonOlder "3.4.0"; diff --git a/pkgs/development/python-modules/pynest2d/default.nix b/pkgs/development/python-modules/pynest2d/default.nix index 694459bf0050..a3b1929feb44 100644 --- a/pkgs/development/python-modules/pynest2d/default.nix +++ b/pkgs/development/python-modules/pynest2d/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, python, cmake -, libnest2d, sip_4, clipper }: +, libnest2d, sip4, clipper }: buildPythonPackage rec { version = "4.12.0"; @@ -13,7 +13,7 @@ buildPythonPackage rec { hash = "sha256-QQdTDhO4i9NVhegGTmdEQSNv3gooaZzTX/Rv86h3GEo="; }; - propagatedBuildInputs = [ libnest2d sip_4 clipper ]; + propagatedBuildInputs = [ libnest2d sip4 clipper ]; nativeBuildInputs = [ cmake ]; CLIPPER_PATH = "${clipper.out}"; diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 577cb3ecf8e3..6ee4514cc5e1 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -82,7 +82,7 @@ python3Packages.buildPythonApplication { pygobject3 reportlab usbutils - sip_4 + sip4 dbus-python distro ] ++ lib.optionals withQt5 [ diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix index 2c49c5779752..32bf18af1940 100644 --- a/pkgs/misc/frescobaldi/default.nix +++ b/pkgs/misc/frescobaldi/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { lilypond pygame python-ly - sip_4 + sip4 pyqt5 poppler-qt5 pyqtwebengine diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index fcc3497480b0..60d0b69f60f0 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -443,6 +443,7 @@ mapAliases ({ setuptools_scm = setuptools-scm; # added 2021-06-03 setuptoolsTrial = setuptools-trial; # added 2023-11-11 sharkiqpy = sharkiq; # added 2022-05-21 + sip_4 = sip4; # added 2024-01-07 ssh-mitm = throw "ssh-mitm was removed in favor of the top-level ssh-mitm"; # added 2023-05-09 smart_open = smart-open; # added 2021-03-14 smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 35c07c5c5a50..548dcff87fb2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13210,7 +13210,7 @@ self: super: with self; { sip = callPackage ../development/python-modules/sip { }; - sip_4 = callPackage ../development/python-modules/sip/4.x.nix { }; + sip4 = callPackage ../development/python-modules/sip/4.x.nix { }; sipyco = callPackage ../development/python-modules/sipyco { }; From ea633d632d542c4f5a2c56bb9c80d864c8e80fdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 8 Jan 2024 16:29:13 +0100 Subject: [PATCH 11/95] go-licenses: fix returning empty output when GOROOT differs from built environment see https://github.com/google/go-licenses/issues/149 --- pkgs/development/tools/misc/go-licenses/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/tools/misc/go-licenses/default.nix b/pkgs/development/tools/misc/go-licenses/default.nix index c9bc25973a4e..d6bea02c05bd 100644 --- a/pkgs/development/tools/misc/go-licenses/default.nix +++ b/pkgs/development/tools/misc/go-licenses/default.nix @@ -1,7 +1,9 @@ { lib , buildGoModule , fetchFromGitHub +, go , installShellFiles +, makeWrapper }: buildGoModule rec { @@ -26,13 +28,23 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles + makeWrapper ]; + subPackages = [ "." ]; + + allowGoReference = true; + postInstall = '' installShellCompletion --cmd go-licenses \ --bash <("$out/bin/go-licenses" completion bash) \ --fish <("$out/bin/go-licenses" completion fish) \ --zsh <("$out/bin/go-licenses" completion zsh) + + # workaround empty output when GOROOT differs from built environment + # see https://github.com/google/go-licenses/issues/149 + wrapProgram "$out/bin/go-licenses" \ + --set GOROOT '${go}/share/go' ''; # Tests require internet connection From a97b8f89c50d197736813b5c75055de60fbeaa60 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Thu, 11 Jan 2024 14:20:19 +0100 Subject: [PATCH 12/95] k9s: 0.31.1 -> 0.31.4 --- pkgs/applications/networking/cluster/k9s/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 7ab9b188e72c..c51bc5eb638e 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.31.1"; + version = "0.31.4"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - hash = "sha256-01Hlf/wFJjqQbvr/yvzEb+W8Z3krkPlQHUWw04FM7ts="; + hash = "sha256-M7syAy8Brnh0g4VXXoXM7UjIJLDpvNLA5nqa8yDcxIM="; }; ldflags = [ From 261de50c2ac405cf8dbebcb8054c455a8c1a9f1e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jan 2024 04:02:18 +0000 Subject: [PATCH 13/95] aarch64-esr-decoder: 0.2.1 -> 0.2.3 --- pkgs/by-name/aa/aarch64-esr-decoder/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/aa/aarch64-esr-decoder/package.nix b/pkgs/by-name/aa/aarch64-esr-decoder/package.nix index 72fb2da2e132..33a75b33f30e 100644 --- a/pkgs/by-name/aa/aarch64-esr-decoder/package.nix +++ b/pkgs/by-name/aa/aarch64-esr-decoder/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "aarch64-esr-decoder"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "google"; repo = "aarch64-esr-decoder"; rev = version; - hash = "sha256-YdB/8EUeELcKBj8UMbeWFzJ8HeMHvDgrP2qlOJp2dXA="; + hash = "sha256-U9i5L3s4oQOIqlECSaKkHxS2Vzr6SY4tIUpvl3+oSl0="; }; - cargoHash = "sha256-P55DiHBUkr6mreGnWET4+TzLkKnVQJ0UwvrGp6BQ304="; + cargoHash = "sha256-BdxRvvU3AovlT7QloZ/LlkjRTVCWEsPUj4NkP4gBPsY="; meta = with lib; { description = "A utility for decoding aarch64 ESR register values"; From f5be6706728d17e8df82916f06a3c2424cf258a0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 12 Jan 2024 04:20:00 +0000 Subject: [PATCH 14/95] postgresql12Packages.age,postgresql13Packages.age,postgresql14Packages.age,postgresql15Packages.age,postgresql16Packages.age: 1.4.0-rc0 -> 1.5.0-rc0 --- pkgs/servers/sql/postgresql/ext/age.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix index 3a1c1c8388be..fb5d84992582 100644 --- a/pkgs/servers/sql/postgresql/ext/age.nix +++ b/pkgs/servers/sql/postgresql/ext/age.nix @@ -2,15 +2,16 @@ let hashes = { - "15" = "sha256-1vmwoflbU3++PFDcsLt9gyLkuzMRGNCD7vWl7/6Q+SE="; - "14" = "sha256-w93Q499sZRk4q85A9yqKQjGUd9Pl8UL8K1D3W7mHRTU="; - "13" = "sha256-Sot7FR0oW7kWA680pNCMCmlflu4RfJTSWZn9mrXrpzw="; - "12" = "sha256-XezcXoHHLCD1/2OHmKhxome2pdjOsYAfZlpvOoU3aS4="; + "16" = "sha256-sXh/vmGyYj00ALfFVdeql2DZ6nCJQDNKyNgzlOZnPAw="; + "15" = "sha256-webZWgWZGnSoXwTpk816tjbtHV1UIlXkogpBDAEL4gM="; + "14" = "sha256-jZXhcYBubpjIJ8M5JHXKV5f6VK/2BkypH3P7nLxZz3E="; + "13" = "sha256-HR6nnWt/V2a0rD5eHHUsFIZ1y7lmvLz36URt9pPJnCw="; + "12" = "sha256-JFNk17ESsIt20dwXrfBkQ5E6DbZzN/Q9eS6+WjCXGd4="; }; in stdenv.mkDerivation rec { pname = "age"; - version = "1.4.0-rc0"; + version = "1.5.0-rc0"; src = fetchFromGitHub { owner = "apache"; @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { ]; installPhase = '' - install -D -t $out/lib *.so + install -D -t $out/lib *${postgresql.dlSuffix} install -D -t $out/share/postgresql/extension *.sql install -D -t $out/share/postgresql/extension *.control ''; From b0747e7c45fcef34b9e9790b33d1da0b75ebf6ac Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 12 Jan 2024 04:20:00 +0000 Subject: [PATCH 15/95] ronn: 0.9.1 -> 0.10.1 Changelog: https://github.com/apjanke/ronn-ng/releases/tag/v0.10.1 --- pkgs/development/tools/ronn/Gemfile.lock | 27 +++++++++------- pkgs/development/tools/ronn/gemset.nix | 41 +++++++++++++++--------- 2 files changed, 41 insertions(+), 27 deletions(-) diff --git a/pkgs/development/tools/ronn/Gemfile.lock b/pkgs/development/tools/ronn/Gemfile.lock index a7f76ffd7876..c0366bb17338 100644 --- a/pkgs/development/tools/ronn/Gemfile.lock +++ b/pkgs/development/tools/ronn/Gemfile.lock @@ -1,19 +1,22 @@ GEM remote: https://rubygems.org/ specs: - kramdown (2.3.2) + kramdown (2.4.0) rexml - mini_portile2 (2.8.0) - mustache (0.99.8) - nokogiri (1.13.4) - mini_portile2 (~> 2.8.0) + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + mini_portile2 (2.8.5) + mustache (1.1.1) + nokogiri (1.16.0) + mini_portile2 (~> 2.8.2) racc (~> 1.4) - racc (1.6.0) - rexml (3.2.5) - ronn-ng (0.9.1) - kramdown (~> 2.1) - mustache (~> 0.7, >= 0.7.0) - nokogiri (~> 1.9, >= 1.9.0) + racc (1.7.3) + rexml (3.2.6) + ronn-ng (0.10.1) + kramdown (~> 2, >= 2.1) + kramdown-parser-gfm (~> 1, >= 1.0.1) + mustache (~> 1) + nokogiri (~> 1, >= 1.14.3) PLATFORMS ruby @@ -22,4 +25,4 @@ DEPENDENCIES ronn-ng BUNDLED WITH - 2.3.9 + 2.5.3 diff --git a/pkgs/development/tools/ronn/gemset.nix b/pkgs/development/tools/ronn/gemset.nix index 04703a84a361..0a65000304be 100644 --- a/pkgs/development/tools/ronn/gemset.nix +++ b/pkgs/development/tools/ronn/gemset.nix @@ -5,30 +5,41 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0757lqaq593z8hzdv98nai73ag384dkk7jgj3mcq2r6ix7130ifb"; + sha256 = "1ic14hdcqxn821dvzki99zhmcy130yhv5fqfffkcf87asv5mnbmn"; type = "gem"; }; - version = "2.3.2"; + version = "2.4.0"; + }; + kramdown-parser-gfm = { + dependencies = ["kramdown"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv"; + type = "gem"; + }; + version = "1.1.0"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.5"; }; mustache = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2"; + sha256 = "1l0p4wx15mi3wnamfv92ipkia4nsx8qi132c6g51jfdma3fiz2ch"; type = "gem"; }; - version = "0.99.8"; + version = "1.1.1"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -36,40 +47,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g43ii497cwdqhfnaxfl500bq5yfc5hfv5df1lvf6wcjnd708ihd"; + sha256 = "1l8b0i24h4irivyhwy9xmkjbggw86cxkzkiqdqg0jpcp9qc8h4rl"; type = "gem"; }; - version = "1.13.4"; + version = "1.16.0"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.3"; }; rexml = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; type = "gem"; }; - version = "3.2.5"; + version = "3.2.6"; }; ronn-ng = { - dependencies = ["kramdown" "mustache" "nokogiri"]; + dependencies = ["kramdown" "kramdown-parser-gfm" "mustache" "nokogiri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1slxfg57cabmh98fw507z4ka6lwq1pvbrqwppflxw6700pi8ykfh"; + sha256 = "1h2y2v3wkl5c710wfanqwxlxi74l1ssva8yrzsg8iypvq22h3ssf"; type = "gem"; }; - version = "0.9.1"; + version = "0.10.1"; }; } From 807c029a1da8fb0a9589e8ad50ffa58ce1016ba6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jan 2024 05:09:35 +0000 Subject: [PATCH 16/95] python311Packages.oslo-serialization: 5.2.0 -> 5.3.0 --- .../development/python-modules/oslo-serialization/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-serialization/default.nix b/pkgs/development/python-modules/oslo-serialization/default.nix index acfdcbfecb0a..9a3677ccfd6d 100644 --- a/pkgs/development/python-modules/oslo-serialization/default.nix +++ b/pkgs/development/python-modules/oslo-serialization/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "oslo-serialization"; - version = "5.2.0"; + version = "5.3.0"; format = "setuptools"; src = fetchPypi { pname = "oslo.serialization"; inherit version; - hash = "sha256-nPAw1hpszh9Hpi1AUPXoPhvRoQGKxnG7GTruB9Fb28I="; + hash = "sha256-IoiY9PM7feq8dCibMrvTAqZZw5z23akEhRD5MPxPdu0="; }; postPatch = '' From bb0c8c6bb89d384023935e87ebdd1239ed6d242c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 12 Jan 2024 10:05:41 +0000 Subject: [PATCH 17/95] dmd: improve eval failure on `pkgsLLVM` package set `dmd` requires `libgcc` to be able to run `dmd` binary. As a result `pkgsLLVM.dmd` fails the eval as: $ nix build -f. pkgsLLVM.dmd error: attribute 'libgcc' missing at pkgs/development/compilers/dmd/binary.nix:31:5: 30| glibc 31| stdenv.cc.cc.libgcc | ^ Such reference to non-existent attributes is an unrecoverable exception. The change turns it into recoverable `assert`: $ nix build --no-link -f. pkgsLLVM.dmd error: assertion '((hostPlatform).isLinux -> (((stdenv).cc.cc) ? libgcc))' failed at pkgs/development/compilers/dmd/binary.nix:12:1: 11| # and can't build `dmd`. 12| assert hostPlatform.isLinux -> (stdenv.cc.cc ? libgcc); | ^ --- pkgs/development/compilers/dmd/binary.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/dmd/binary.nix b/pkgs/development/compilers/dmd/binary.nix index 6a99d42eff72..3a5d6b76cec8 100644 --- a/pkgs/development/compilers/dmd/binary.nix +++ b/pkgs/development/compilers/dmd/binary.nix @@ -5,7 +5,12 @@ let inherit (stdenv) hostPlatform; OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; MODEL = toString hostPlatform.parsed.cpu.bits; -in stdenv.mkDerivation { +in + +# On linux pargets like `pkgsLLVM.dmd` `cc` does not expose `libgcc` +# and can't build `dmd`. +assert hostPlatform.isLinux -> (stdenv.cc.cc ? libgcc); +stdenv.mkDerivation { pname = "dmd-bootstrap"; inherit version; From 1afec60c2bcc5bc7be060be9ed102d4aab42486e Mon Sep 17 00:00:00 2001 From: arthsmn Date: Fri, 12 Jan 2024 12:18:22 -0300 Subject: [PATCH 18/95] skrooge: 1.28.0 -> 1.31.0 --- pkgs/applications/office/skrooge/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index e59d473a0789..b3c1c3937955 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchurl, - cmake, extra-cmake-modules, qtwebengine, qtscript, grantlee, + cmake, extra-cmake-modules, qtwebengine, qtscript, grantlee, qtxmlpatterns, kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin, kiconthemes, knewstuff, sqlcipher, qca-qt5, kactivities, karchive, kguiaddons, knotifyconfig, krunner, kwindowsystem, libofx, shared-mime-info @@ -7,11 +7,11 @@ mkDerivation rec { pname = "skrooge"; - version = "2.28.0"; + version = "2.31.0"; src = fetchurl { url = "mirror://kde/stable/skrooge/skrooge-${version}.tar.xz"; - sha256 = "sha256-s2SkGMBx7HVpr1NBUJpqji3PTPnw4RqnkakdQVC5ric="; + hash = "sha256-S90sUKJkUwgPAGlIuyN05a5DoehTFpFOnVLMF8Ac+HI="; }; nativeBuildInputs = [ @@ -19,7 +19,7 @@ mkDerivation rec { ]; buildInputs = [ - qtwebengine qtscript grantlee kxmlgui kwallet kparts + qtwebengine qtscript grantlee kxmlgui kwallet kparts qtxmlpatterns kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5 kactivities karchive kguiaddons knotifyconfig krunner kwindowsystem libofx ]; From f8d3003c1a503b3a035ddcf60a410059aeea0034 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 12 Jan 2024 07:42:46 +0100 Subject: [PATCH 19/95] ruff: 0.1.11 -> 0.1.13 Diff: https://github.com/astral-sh/ruff/compare/refs/tags/v0.1.11...v0.1.13 Changelog: https://github.com/astral-sh/ruff/releases/tag/v0.1.13 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index de35b0a7f71f..dadfba7cc67b 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.1.11"; + version = "0.1.13"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/v${version}"; - hash = "sha256-yKb74GADeALai4qZ/+dR6u/QzKQF5404+YJKSYU/oFU="; + hash = "sha256-cH/Vw04QQ3U7E1ZCwozjhPcn0KVljP976/p3okrBpEU="; }; - cargoHash = "sha256-lvgLQH/WaLTO0k/L7n9ujylOhbbFAn3R4MY5JsOTcwI="; + cargoHash = "sha256-tmoFnghHQEsyv0vO9fnWyTsxiIhmovhi/zHXOCi5u10="; nativeBuildInputs = [ installShellFiles From 0b7ff3b06e29f9203e44b9f92e055cd7b3c7ba5b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 12 Jan 2024 10:10:55 +0100 Subject: [PATCH 20/95] python311Packages.python-lsp-ruff: 2.0.1 -> 2.0.2 Changelog: https://github.com/python-lsp/python-lsp-ruff/releases/tag/v2.0.2 --- pkgs/development/python-modules/python-lsp-ruff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-lsp-ruff/default.nix b/pkgs/development/python-modules/python-lsp-ruff/default.nix index e7c344c8fdbb..d104a79996d3 100644 --- a/pkgs/development/python-modules/python-lsp-ruff/default.nix +++ b/pkgs/development/python-modules/python-lsp-ruff/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "python-lsp-ruff"; - version = "2.0.1"; + version = "2.0.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit version; pname = "python-lsp-ruff"; - sha256 = "sha256-sgS0wwFuAaaen9b/vpJrpAsUvE2lehfHVaOB/hSol9k="; + hash = "sha256-tKYhkRnXPZF1/9iK6ssNtoWa5y9gYVj9zFUOEFlXyOA="; }; postPatch = '' From 9e2cd6f8728c79b6298f8005292fae9bec0bcf97 Mon Sep 17 00:00:00 2001 From: Niko <97130632+Nyabinary@users.noreply.github.com> Date: Wed, 20 Dec 2023 11:53:35 -0500 Subject: [PATCH 21/95] nixos/network-interfaces: remove network-interfaces.target Co-authored-by: Martin Weinelt --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 ++ nixos/modules/tasks/network-interfaces.nix | 10 ---------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 5c05ad780d90..4f01e74d849c 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -65,6 +65,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `paperless`' `services.paperless.extraConfig` setting has been removed and converted to the freeform type and option named `services.paperless.settings`. +- The legacy and long deprecated systemd target `network-interfaces.target` has been removed. Use `network.target` instead. + - `mkosi` was updated to v19. Parts of the user interface have changed. Consult the [release notes](https://github.com/systemd/mkosi/releases/tag/v19) for a list of changes. diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 2b2d24a64cb2..ca0b219b3c93 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -1449,16 +1449,6 @@ in listToAttrs ]; - # The network-interfaces target is kept for backwards compatibility. - # New modules must NOT use it. - systemd.targets.network-interfaces = - { description = "All Network Interfaces (deprecated)"; - wantedBy = [ "network.target" ]; - before = [ "network.target" ]; - after = [ "network-pre.target" ]; - unitConfig.X-StopOnReconfiguration = true; - }; - systemd.services = { network-local-commands = { description = "Extra networking commands."; From c0ef1f947903325d9cdc84edf011041b52d59fa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 24 Dec 2023 13:54:48 +0100 Subject: [PATCH 22/95] nixos/network-interfaces: add assertion if used in after or wants --- nixos/modules/system/boot/systemd.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 87333999313e..c3902007906a 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -451,6 +451,21 @@ in cfg.services ); + assertions = concatLists ( + mapAttrsToList + (name: service: + map (message: { + assertion = false; + inherit message; + }) (concatLists [ + (optional ((builtins.elem "network-interfaces.target" service.after) || (builtins.elem "network-interfaces.target" service.wants)) + "Service '${name}.service' is using the deprecated target network-interfaces.target, which no longer exists. Using network.target is recommended instead." + ) + ]) + ) + cfg.services + ); + system.build.units = cfg.units; system.nssModules = [ cfg.package.out ]; From cbe1e1f97f2b3e79daad13962a4770f896973036 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jan 2024 20:13:49 +0000 Subject: [PATCH 23/95] ausweisapp: 2.0.1 -> 2.0.2 --- pkgs/applications/misc/ausweisapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ausweisapp/default.nix b/pkgs/applications/misc/ausweisapp/default.nix index ab7089e5199f..d6f863576a27 100644 --- a/pkgs/applications/misc/ausweisapp/default.nix +++ b/pkgs/applications/misc/ausweisapp/default.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ausweisapp"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = finalAttrs.version; - hash = "sha256-RUjc4KqyKZXBW+CMaRhKsbwVzmWw6/QHNK+RpBd7Gxw="; + hash = "sha256-m+GZkaJyuqErsvkUXi+uAsrMXHyQg9Vd77ZkfGxMqg4="; }; nativeBuildInputs = [ From 3c15cf428e5f27daaa05f6aeeff295f3347cfe0b Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 12 Jan 2024 22:44:42 +0100 Subject: [PATCH 24/95] lomiri.lomiri-api: Apply patch for GCC13 support --- pkgs/desktops/lomiri/development/lomiri-api/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/desktops/lomiri/development/lomiri-api/default.nix b/pkgs/desktops/lomiri/development/lomiri-api/default.nix index f4a7c968c66f..9f699bbd715a 100644 --- a/pkgs/desktops/lomiri/development/lomiri-api/default.nix +++ b/pkgs/desktops/lomiri/development/lomiri-api/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitLab +, fetchpatch , gitUpdater , makeFontsConf , testers @@ -31,6 +32,14 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" "doc" ]; + patches = [ + (fetchpatch { + name = "0001-lomiri-api-Add-missing-headers-for-GCC13.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-api/-/commit/029b42a9b4d5467951595dff8bc536eb5a9e3ef7.patch"; + hash = "sha256-eWrDQGrwf22X49rtUAVbrd+QN+OwyGacVLCWYFsS02o="; + }) + ]; + postPatch = '' patchShebangs $(find test -name '*.py') From b132f6106c3c5a5df1d187e8f810f555d20e3374 Mon Sep 17 00:00:00 2001 From: Ali Caglayan Date: Fri, 12 Jan 2024 19:43:35 +0000 Subject: [PATCH 25/95] git-ps-rs: 6.9.0 -> 7.0.0 Signed-off-by: Ali Caglayan Signed-off-by: Ali Caglayan --- pkgs/development/tools/git-ps-rs/Cargo.lock | 1264 ------------------ pkgs/development/tools/git-ps-rs/default.nix | 21 +- 2 files changed, 5 insertions(+), 1280 deletions(-) delete mode 100644 pkgs/development/tools/git-ps-rs/Cargo.lock diff --git a/pkgs/development/tools/git-ps-rs/Cargo.lock b/pkgs/development/tools/git-ps-rs/Cargo.lock deleted file mode 100644 index 43eb2b8d588d..000000000000 --- a/pkgs/development/tools/git-ps-rs/Cargo.lock +++ /dev/null @@ -1,1264 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "build-rs" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b00b8763668c99f8d9101b8a0dd82106f58265464531a79b2cef0d9a30c17dd2" - -[[package]] -name = "bumpalo" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" -dependencies = [ - "jobserver", -] - -[[package]] -name = "cfg-expr" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35b255461940a32985c627ce82900867c61db1659764d3675ea81963f72a4c6" -dependencies = [ - "smallvec", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "conv" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ff10625fd0ac447827aa30ea8b861fead473bb60aeb73af6c1c58caf0d1299" -dependencies = [ - "custom_derive", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "cstr-argument" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bd9c8e659a473bce955ae5c35b116af38af11a7acb0b480e01f3ed348aeb40" -dependencies = [ - "cfg-if", - "memchr", -] - -[[package]] -name = "custom_derive" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8ae57c4978a2acd8b869ce6b9ca1dfe817bff704c220209fdef2c0b75a01b9" - -[[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "flate2" -version = "1.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "form_urlencoded" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "getrandom" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "git2" -version = "0.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b7905cdfe33d31a88bb2e8419ddd054451f5432d1da9eaf2ac7804ee1ea12d5" -dependencies = [ - "bitflags", - "libc", - "libgit2-sys", - "log", - "openssl-probe", - "openssl-sys", - "url", -] - -[[package]] -name = "gpg-error" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89aaeddbfb92313378c58e98abadaaa34082b3855f1d455576eeeda08bd592c" -dependencies = [ - "libgpg-error-sys", -] - -[[package]] -name = "gpgme" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57539732fbe58eacdb984734b72b470ed0bca3ab7a49813271878567025ac44f" -dependencies = [ - "bitflags", - "cfg-if", - "conv", - "cstr-argument", - "gpg-error", - "gpgme-sys", - "libc", - "memoffset 0.7.1", - "once_cell", - "smallvec", - "static_assertions", -] - -[[package]] -name = "gpgme-sys" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509223d659c06e4a26229437d6ac917723f02d31917c86c6ecd50e8369741cf7" -dependencies = [ - "build-rs", - "libc", - "libgpg-error-sys", - "system-deps", - "winreg", -] - -[[package]] -name = "gps" -version = "6.9.0" -dependencies = [ - "ansi_term", - "git2", - "gpgme", - "home-dir", - "is_executable", - "lazy_static", - "regex", - "serde", - "serde_json", - "structopt", - "tempfile", - "toml 0.5.11", - "ureq", - "uuid", - "version-compare", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "home-dir" -version = "0.1.0" -source = "git+https://github.com/uptech/home-dir?branch=upgrade-nix-dependency-to-latest#1627fb4c2f8ae31081f6a43813de170d2e694207" -dependencies = [ - "nix", - "thiserror", -] - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "is_executable" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa9acdc6d67b75e626ad644734e8bc6df893d9cd2a834129065d3dd6158ea9c8" -dependencies = [ - "winapi", -] - -[[package]] -name = "itoa" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "jobserver" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.141" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" - -[[package]] -name = "libgit2-sys" -version = "0.15.1+1.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4577bde8cdfc7d6a2a4bcb7b049598597de33ffd337276e9c7db6cd4a2cee7" -dependencies = [ - "cc", - "libc", - "libssh2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", -] - -[[package]] -name = "libgpg-error-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c97079310f39c835d3bd73578379d040f779614bb331c7ffbb6630fee6420290" -dependencies = [ - "build-rs", - "system-deps", - "winreg", -] - -[[package]] -name = "libssh2-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libz-sys" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b085a4f2cde5781fc4b1717f2e86c62f5cda49de7ba99a7c2eae02b61c9064c" - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "nix" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" -dependencies = [ - "bitflags", - "cfg-if", - "libc", - "memoffset 0.6.5", -] - -[[package]] -name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d3d193fb1488ad46ffe3aaabc912cc931d02ee8518fe2959aea8ef52718b0c0" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "pkg-config" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags", -] - -[[package]] -name = "regex" -version = "1.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi", -] - -[[package]] -name = "rustix" -version = "0.37.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79bef90eb6d984c72722595b5b1348ab39275a5e5123faca6863bf07d75a4e0" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustls" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" -dependencies = [ - "log", - "ring", - "sct", - "webpki", -] - -[[package]] -name = "ryu" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "serde" -version = "1.0.160" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.160" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "serde_json" -version = "1.0.96" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" -dependencies = [ - "serde", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "structopt" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" -dependencies = [ - "clap", - "lazy_static", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.4.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" -dependencies = [ - "heck 0.3.3", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "system-deps" -version = "6.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "555fc8147af6256f3931a36bb83ad0023240ce9cf2b319dec8236fd1f220b05f" -dependencies = [ - "cfg-expr", - "heck 0.4.1", - "pkg-config", - "toml 0.7.3", - "version-compare", -] - -[[package]] -name = "tempfile" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall", - "rustix", - "windows-sys 0.45.0", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.15", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "toml" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "ureq" -version = "2.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "338b31dd1314f68f3aabf3ed57ab922df95ffcd902476ca7ba3c4ce7b908c46d" -dependencies = [ - "base64", - "flate2", - "log", - "once_cell", - "rustls", - "url", - "webpki", - "webpki-roots", -] - -[[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "uuid" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b55a3fef2a1e3b3a00ce878640918820d3c51081576ac657d23af9fc7928fdb" -dependencies = [ - "getrandom", - "serde", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "version-compare" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" - -[[package]] -name = "web-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.0", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" -dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "winnow" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] diff --git a/pkgs/development/tools/git-ps-rs/default.nix b/pkgs/development/tools/git-ps-rs/default.nix index 69327f6fa555..5ca3686baee7 100644 --- a/pkgs/development/tools/git-ps-rs/default.nix +++ b/pkgs/development/tools/git-ps-rs/default.nix @@ -3,8 +3,6 @@ , rustPlatform , stdenv , pkg-config -, libgpg-error -, gpgme , dbus , openssl , Security @@ -12,29 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "git-ps-rs"; - version = "6.9.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "uptech"; repo = "git-ps-rs"; rev = version; - hash = "sha256-D6613T87jLEur8WXHed2cSKVafKVfgGWap/z/UBe31U="; + hash = "sha256-HPHFjYfug642NXeNmv50UzsdOAlDR9F/MtgYnzwiZP8="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "home-dir-0.1.0" = "sha256-k5GYZcR1FI/JEfJhPWOdICBZ9CqJCqX+fYygxxWvFp4="; - }; - }; + cargoHash = "sha256-mvRcOwCe5NQ+cJ9brnbZ6HLtLn+fnjYzSBQwA3Qn9PU="; - nativeBuildInputs = [ - pkg-config - gpgme # gpgme runs a small script at build time so has to go here - ]; + nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl dbus libgpg-error gpgme ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl dbus ] ++ lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { description = "Tool for working with a stack of patches"; From 3b85481052bb1feb5dd54977696482b119e08acc Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 12 Jan 2024 19:45:53 -0500 Subject: [PATCH 26/95] libewf: fix cross compilation --- pkgs/development/libraries/libewf/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index 101f8f16a3f4..dffacc7d276c 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ zlib openssl libuuid ] ++ lib.optionals stdenv.isDarwin [ bzip2 ]; + # cannot run test program while cross compiling + configureFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "ac_cv_openssl_xts_duplicate_keys=yes" + ]; + meta = { description = "Library for support of the Expert Witness Compression Format"; homepage = "https://sourceforge.net/projects/libewf/"; From 4da26408150fad7cfdb139f90ac3834fe80225c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Jan 2024 13:09:29 +0000 Subject: [PATCH 27/95] nebula: 1.8.1 -> 1.8.2 --- pkgs/tools/networking/nebula/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index 2be42d891466..5420c5fa35c3 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nebula"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "slackhq"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-lLDoAR3n3V0hJWvvSqz0nWXSsiXK+kjJJo7okv4KX8c="; + hash = "sha256-tbzdbI4QTLQcJ6kyD3c+jQvXn9ERV/9hrzNPXV9XwVM="; }; - vendorHash = "sha256-amOveyxXGyQVV6yQspExXfj0JTN9yLs6+bcKYRst1tU="; + vendorHash = "sha256-BL9Tx87pBZIAuoneu6Sm2gjyTTC6yOZv5GVYNNeuhtw="; subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; From 19b6433e2b45239eccd3d57d1e90ef87421b2a50 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 13 Jan 2024 04:20:00 +0000 Subject: [PATCH 28/95] postgresqlPackages.plpgsql_check: 2.7.1 -> 2.7.2 Diff: https://github.com/okbob/plpgsql_check/compare/v2.7.1...v2.7.2 Changelog: https://github.com/okbob/plpgsql_check/releases/tag/v2.7.2 --- pkgs/servers/sql/postgresql/ext/plpgsql_check.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index 3d3461dbd0c0..db1199b20d77 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql-check"; - version = "2.7.1"; + version = "2.7.2"; src = fetchFromGitHub { owner = "okbob"; repo = "plpgsql_check"; rev = "v${version}"; - hash = "sha256-2SOBisIElNqqg5NwFk+pp7sE/+OvTifJUKMWOaOvO3k="; + hash = "sha256-7CHKcUpqEXJ+z0OcxrEpYHaO/zUtRbCXa8LgL+/roSg="; }; buildInputs = [ postgresql ]; From 93657647fae0c2ac8c4c2cd3331e8ec3d2903123 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jan 2024 05:09:03 +0000 Subject: [PATCH 29/95] gmic-qt: 3.3.2 -> 3.3.3 --- pkgs/tools/graphics/gmic-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix index 684d6abadfed..a67479e4ffd5 100644 --- a/pkgs/tools/graphics/gmic-qt/default.nix +++ b/pkgs/tools/graphics/gmic-qt/default.nix @@ -54,11 +54,11 @@ assert lib.assertMsg stdenv.mkDerivation (finalAttrs: { pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}"; - version = "3.3.2"; + version = "3.3.3"; src = fetchzip { url = "https://gmic.eu/files/source/gmic_${finalAttrs.version}.tar.gz"; - hash = "sha256-VaGYjCp1KVRTxEKzUdMCavZBIGEnEvP5fdFqQeKGa44="; + hash = "sha256-LkWQ3fSHJSaXztX+soGZ+pl3MnXNgw6tV09356bAfYY="; }; nativeBuildInputs = [ From 87e55e6763f44120da6f51133da906e986897265 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Jan 2024 10:27:24 +0100 Subject: [PATCH 30/95] python311Packages.pyroute2: 0.7.10 -> 0.7.11 Diff: https://github.com/svinota/pyroute2/compare/refs/tags/0.7.10...0.7.11 Changelog: https://github.com/svinota/pyroute2/blob/0.7.11/CHANGELOG.rst --- .../python-modules/pyroute2/default.nix | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index f24534af0083..c0413ab53fd6 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -1,31 +1,30 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , importlib-metadata -, mitogen , pythonOlder , setuptools }: buildPythonPackage rec { pname = "pyroute2"; - version = "0.7.10"; - format = "pyproject"; + version = "0.7.11"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-zC+QqtFRfLCzAQQfZ4zI08NCfCblPxXHjJPGeSjYmgI="; + src = fetchFromGitHub { + owner = "svinota"; + repo = "pyroute2"; + rev = "refs/tags/${version}"; + hash = "sha256-rX/aUmL9H4dSoRngxVVX1olfGtxK93g76E6Z0CYNr2M="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ - mitogen - ] ++ lib.optionals (pythonOlder "3.8") [ + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; @@ -49,7 +48,7 @@ buildPythonPackage rec { description = "Python Netlink library"; homepage = "https://github.com/svinota/pyroute2"; changelog = "https://github.com/svinota/pyroute2/blob/${version}/CHANGELOG.rst"; - license = licenses.asl20; + license = with licenses; [ asl20 /* or */ gpl2Plus ]; maintainers = with maintainers; [ fab mic92 ]; platforms = platforms.unix; }; From 40cc9e497bbf7a62dcc3401198fde0e88bad4c88 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Sat, 13 Jan 2024 14:56:21 +0100 Subject: [PATCH 31/95] openrct2: 0.4.5 -> 0.4.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.4.6 - https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.4.7 Updating to 0.4.6 resulted some headaches, as suddenly lots of errors about missing music objects were thrown and old maps were not loadable. This was also mentioned in #263025. Today I git bisect'ed OpenRCT2's source between 0.4.5 and 0.4.6, finding 5adbea9ac829b76507543e4c09b2000138ffbbcf as the culprit, which origins in OpenRCT2/OpenRCT2#19785. From there I got to OpenRCT2/OpenRCT2#21043 which addresses this very issue and fixes it by undoing the original change next to some later changes. This PR is now included as a patch and, et voilà, OpenRCT2 works again! Closes #263025. --- pkgs/games/openrct2/default.nix | 34 ++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index e056164e279a..c38c1ae8031d 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -1,12 +1,14 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , SDL2 , cmake , curl , discord-rpc , duktape +, expat , flac , fontconfig , freetype @@ -28,48 +30,48 @@ }: let - openrct2-version = "0.4.5"; + openrct2-version = "0.4.7"; # Those versions MUST match the pinned versions within the CMakeLists.txt # file. The REPLAYS repository from the CMakeLists.txt is not necessary. - objects-version = "1.3.11"; - openmsx-version = "1.3.0"; + objects-version = "1.3.13"; + openmsx-version = "1.5"; opensfx-version = "1.0.3"; - title-sequences-version = "0.4.0"; + title-sequences-version = "0.4.6"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${openrct2-version}"; - sha256 = "sha256-TMtaEqui3gUd+j3LwF7VsHiBtbYZMu6Rvo1aMkkU9LY="; + hash = "sha256-2nSzXbZH1o+BEaxhdQTCM/u4Qbun4tqBKjQ4z7owHeg="; }; objects-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "objects"; rev = "v${objects-version}"; - sha256 = "sha256-fA2Kz4GALu6IP7ulbwpAFt3dz6NCPgyB0CWy5uOLBQY="; + hash = "sha256-7RvRe7skXH5x8RbkQgtKs1YMBwq8dHInVo/4FAJwUD0="; }; openmsx-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenMusic"; rev = "v${openmsx-version}"; - sha256 = "sha256-bp+uwTy2ZFMCK8Dq4YVACpQSwo8v1te+NQGwdqViIjU="; + hash = "sha256-p/wlvQFfu3R+jIuCcRbTMvxt0VKGGwJw0NDIsf6URWI="; }; opensfx-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenSoundEffects"; rev = "v${opensfx-version}"; - sha256 = "sha256-AMuCpq1Hszi2Vikto/cX9g81LwBDskaRMTLxNzU0/Gk="; + hash = "sha256-AMuCpq1Hszi2Vikto/cX9g81LwBDskaRMTLxNzU0/Gk="; }; title-sequences-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "title-sequences"; rev = "v${title-sequences-version}"; - sha256 = "sha256-anqCZkhYoaxPu3MYCYSsFFngOmPp2wnx2MGb0hj6W5U="; + hash = "sha256-HWp2ecClNM/7O3oaydVipOnEsYNP/bZnZFS+SDidPi0="; }; in stdenv.mkDerivation { @@ -78,6 +80,19 @@ stdenv.mkDerivation { src = openrct2-src; + patches = [ + # https://github.com/OpenRCT2/OpenRCT2/pull/21043 + # + # Basically has broken + # OpenRCT2 - at least with older maps, as were used for testing - as stated + # in . + (fetchpatch { + name = "remove-openrct2-music.patch"; + url = "https://github.com/OpenRCT2/OpenRCT2/commit/9ea13848be0b974336c34e6eb119c49ba42a907c.patch"; + hash = "sha256-2PPRqUZf4+ys89mdzp5nvdtdv00V9Vzj3v/95rmlf1c="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config @@ -88,6 +103,7 @@ stdenv.mkDerivation { curl discord-rpc duktape + expat flac fontconfig freetype From ffff7c634e75d0055279e9a0f173c37be319ae72 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Jan 2024 15:36:11 +0100 Subject: [PATCH 32/95] python311Packages.weasel: update meta --- pkgs/development/python-modules/weasel/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/weasel/default.nix b/pkgs/development/python-modules/weasel/default.nix index a8137ccd3814..0ba881088c9c 100644 --- a/pkgs/development/python-modules/weasel/default.nix +++ b/pkgs/development/python-modules/weasel/default.nix @@ -59,8 +59,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Weasel: A small and easy workflow system"; + description = "A small and easy workflow system"; homepage = "https://github.com/explosion/weasel/"; + changelog = "https://github.com/explosion/weasel/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ GaetanLepage ]; }; From 42f9dfc75b1409f71f4258bbbf88f430d67a008d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Jan 2024 15:36:50 +0100 Subject: [PATCH 33/95] python311Packages.weasel: remove wheel --- pkgs/development/python-modules/weasel/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/weasel/default.nix b/pkgs/development/python-modules/weasel/default.nix index 0ba881088c9c..94854968c928 100644 --- a/pkgs/development/python-modules/weasel/default.nix +++ b/pkgs/development/python-modules/weasel/default.nix @@ -3,7 +3,6 @@ , pythonOlder , fetchFromGitHub , setuptools -, wheel , cloudpathlib , confection , packaging @@ -32,7 +31,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - wheel ]; propagatedBuildInputs = [ From 44511ca9b6a427e99f79d6c2ebe19a729c72b724 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Jan 2024 15:37:59 +0100 Subject: [PATCH 34/95] python311Packages.weasel: relax constraint for cloudpathlib Acc. to https://github.com/drivendataorg/cloudpathlib/releases/tag/v0.17.0 does 0.17.0 not contain breaking changes --- pkgs/development/python-modules/weasel/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/weasel/default.nix b/pkgs/development/python-modules/weasel/default.nix index 94854968c928..a5433c81db0e 100644 --- a/pkgs/development/python-modules/weasel/default.nix +++ b/pkgs/development/python-modules/weasel/default.nix @@ -1,18 +1,19 @@ { lib , buildPythonPackage -, pythonOlder -, fetchFromGitHub -, setuptools , cloudpathlib , confection +, fetchFromGitHub , packaging , pydantic +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook , requests +, setuptools , smart-open , srsly , typer , wasabi -, pytestCheckHook }: buildPythonPackage rec { @@ -29,7 +30,12 @@ buildPythonPackage rec { hash = "sha256-6Ck8R10/YW2Nc6acNk2bzgyqSg+OPqwyJjhUgXP/umw="; }; + pythonRelaxDeps = [ + "cloudpathlib" + ]; + nativeBuildInputs = [ + pythonRelaxDepsHook setuptools ]; From 77414ffdbacdc8dbe3a3d26b6cd594b55eed5baa Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 13 Jan 2024 15:42:43 +0100 Subject: [PATCH 35/95] libsidplayfp: 2.5.1 -> 2.6.0 --- .../libraries/libsidplayfp/default.nix | 25 ++----------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index fbfdc0b7ff0d..ba1b003442ff 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , makeFontsConf , nix-update-script , testers @@ -19,14 +18,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsidplayfp"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-1e1QDSJ8CjLU794saba2auCKko7p2ylrdI0JWhh8Kco="; + hash = "sha256-6Gbujz20EHQ7s9GaPpEPju+WqePjpduJqb5hcrswTm8="; }; outputs = [ @@ -35,26 +34,6 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; - patches = [ - # Pull autoconf-2.72 compatibility fix: - # https://github.com/libsidplayfp/libsidplayfp/pull/103 - # Remove when version > 2.5.1 - (fetchpatch { - name = "0001-libsidplayfp-autoconf-2.72-compat.patch"; - url = "https://github.com/libsidplayfp/libsidplayfp/commit/2b1b41beb5099d5697e3f8416d78f27634732a9e.patch"; - hash = "sha256-5Hk202IuHUBow7HnnPr2/ieWFjKDuHLQjQ9mJUML9q8="; - }) - - # Fix --disable-tests logic - # https://github.com/libsidplayfp/libsidplayfp/pull/108 - # Remove when version > 2.5.1 - (fetchpatch { - name = "0002-libsidplayfp-Fix-autoconf-logic-for-tests-option.patch"; - url = "https://github.com/libsidplayfp/libsidplayfp/commit/39dd2893b6186c4932d17b529bb62627b742b742.patch"; - hash = "sha256-ErdfPvu8R81XxdHu2TaV87OpLFlRhJai51QcYUIkUZ4="; - }) - ]; - postPatch = '' patchShebangs . ''; From 5f9b9b9fea9c7c7c20faaa7e3f51aa378ea9b9c4 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 13 Jan 2024 16:54:04 +0000 Subject: [PATCH 36/95] seq66: fix build against `gcc-13` Without the chnage build fails on `master` as: In file included from os/daemonize.cpp:64: ../include/os/daemonize.hpp:58:8: error: 'uint32_t' does not name a type 58 | extern uint32_t daemonize | ^~~~~~~~ ../include/os/daemonize.hpp:36:1: note: 'uint32_t' is defined in header ''; did you forget to '#include '? 35 | #include "seq66_platform_macros.h" /* for detecting 32-bit builds */ +++ |+#include As upstream changes are quite invasive for backport I am only injecting missing headers. --- pkgs/applications/audio/seq66/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/audio/seq66/default.nix b/pkgs/applications/audio/seq66/default.nix index 0132b9679004..14fc4075e377 100644 --- a/pkgs/applications/audio/seq66/default.nix +++ b/pkgs/applications/audio/seq66/default.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { for d in libseq66/include libseq66/src libsessions/include libsessions/src seq_qt5/src seq_rtmidi/include seq_rtmidi/src Seqtool/src; do substituteInPlace "$d/Makefile.am" --replace '$(git_info)' '${version}' done + + # gcc-13 headers compatibilty. TODO: try to remove with next version + # update + sed -e '1i #include ' -i libseq66/src/os/daemonize.cpp ''; enableParallelBuilding = true; From 8d13307c752b3dd1dd0a9cf8f999fbe81114dfee Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Sat, 13 Jan 2024 19:03:28 +0100 Subject: [PATCH 37/95] k9s: 0.31.4 -> 0.31.5 --- pkgs/applications/networking/cluster/k9s/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index c51bc5eb638e..457c1fa4d5b0 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.31.4"; + version = "0.31.5"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - hash = "sha256-M7syAy8Brnh0g4VXXoXM7UjIJLDpvNLA5nqa8yDcxIM="; + hash = "sha256-ZNYIGs8oBy4U7y4GiOCcIhnAGRx92V+cQzTE+40QE+A="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-F7RxqxfjcmBAa8MmgRfUvEEtGMvs7NK5P257n7isl9E="; + vendorHash = "sha256-RXKotLyH97EgfDxQzFSSgATGu96SnfwZyR3WprhwsMM="; # TODO investigate why some config tests are failing doCheck = !(stdenv.isDarwin && stdenv.isAarch64); From 10697291ccaca764d239f16d6874ba70bdb0c214 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 13 Jan 2024 18:52:18 +0000 Subject: [PATCH 38/95] readstat: backport "use-after-free" fix --- pkgs/applications/science/math/readstat/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/science/math/readstat/default.nix b/pkgs/applications/science/math/readstat/default.nix index 08555d12640f..6abae18c5c66 100644 --- a/pkgs/applications/science/math/readstat/default.nix +++ b/pkgs/applications/science/math/readstat/default.nix @@ -16,6 +16,13 @@ stdenv.mkDerivation rec { url = "https://github.com/WizardMac/ReadStat/commit/211c342a1cfe46fb7fb984730dd7a29ff4752f35.patch"; hash = "sha256-nkaEgusylVu7NtzSzBklBuOnqO9qJPovf0qn9tTE6ls="; }) + + # Backport use-after-free: + # https://github.com/WizardMac/ReadStat/pull/298 + (fetchpatch { + url = "https://github.com/WizardMac/ReadStat/commit/718d49155e327471ed9bf4a8c157f849f285b46c.patch"; + hash = "sha256-9hmuFa05b4JlxSzquIxXArOGhbi27A+3y5gH1IDg+R0="; + }) ]; nativeBuildInputs = [ pkg-config autoreconfHook ]; From 38b5d66a3f80ce166fea08db0be6e011c08ece0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jan 2024 20:39:26 +0000 Subject: [PATCH 39/95] python311Packages.clip-anytorch: 2.5.2 -> 2.6.0 --- pkgs/development/python-modules/clip-anytorch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/clip-anytorch/default.nix b/pkgs/development/python-modules/clip-anytorch/default.nix index b689d5708d5f..d17a1ad088fd 100644 --- a/pkgs/development/python-modules/clip-anytorch/default.nix +++ b/pkgs/development/python-modules/clip-anytorch/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "clip-anytorch"; - version = "2.5.2"; + version = "2.6.0"; format = "setuptools"; src = fetchFromGitHub { owner = "rom1504"; repo = "CLIP"; - rev = version; - hash = "sha256-EqVkpMQHawoCFHNupf49NrvLdGCq35wnYBpdP81Ztd4="; + rev = "refs/tags/${version}"; + hash = "sha256-4A8R9aEiOWC05uhMQslhVSkQ4hyjs6VsqkFi76miodY="; }; propagatedBuildInputs = [ From ad088c463938977a7c23dd5b7d470e5762e7a9a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jan 2024 21:01:08 +0000 Subject: [PATCH 40/95] cargo-tarpaulin: 0.27.2 -> 0.27.3 --- pkgs/development/tools/analysis/cargo-tarpaulin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 0a36253630a3..75f6ee44bf99 100644 --- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.27.2"; + version = "0.27.3"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - hash = "sha256-NvpWWk/Rr1Hnekc8vrjmOXknRe9sUFQFwPi0obGfXEA="; + hash = "sha256-ejrnqkeMhCBWCjLCOblhZV/fY4Aib4F1uanufHyUmfw="; }; - cargoHash = "sha256-KuYh1td9O9rSnxtPSYX5zp4A71IQkUJDVR0VaIZOh7g="; + cargoHash = "sha256-YO91vSyMwRTrQxRAgWJemL+dlmnEN7VSGrwnE6z7ocI="; nativeBuildInputs = [ pkg-config From 0f233e832ecf8f036964b99f1cf3b280d678febe Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 13 Jan 2024 22:07:56 +0100 Subject: [PATCH 41/95] codeium: 1.6.20 -> 1.6.22 --- pkgs/by-name/co/codeium/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index 7ecca1ea410b..fdcd82971864 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -13,10 +13,10 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-Tip719cZ2La7d7fdpwrKCTRyUyaZCaNXb3bH0fb6WUs="; - aarch64-linux = "sha256-Ua0GNPZRT4VCeSpnczkWXhzV7fHeyyLJlkOzMXskNiU="; - x86_64-darwin = "sha256-GAus7HeKyEPfts6nKJfKVVsCgdw0nUou+oFO6orIkAM="; - aarch64-darwin = "sha256-AvikE5fIsrIkeJth1x5J+hAJI1U18+JwZpAJe0laDAQ="; + x86_64-linux = "sha256-zJsgYjmnGT9Ye5hnhqtv5piGM1/HT+DFhVivKLlvE1Q="; + aarch64-linux = "sha256-RjIiSgSxkejS+Dun1xMCZ6C9SPH9AahudQMICH3thC0="; + x86_64-darwin = "sha256-PrfHusjA6o1L60eMblnydTKAYe8vKvK2W3jQZYp5dPc="; + aarch64-darwin = "sha256-LpyXsdjPpdoIqFzm3sLOlBBQdJgrNl8cPehNAVqFvXg="; }.${system} or throwSystem; bin = "$out/bin/codeium_language_server"; @@ -24,7 +24,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "codeium"; - version = "1.6.20"; + version = "1.6.22"; src = fetchurl { name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; From c8c569b50aa1c3319ca8de5e53baf3e9e23eeee3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jan 2024 21:26:07 +0000 Subject: [PATCH 42/95] files-cli: 2.12.14 -> 2.12.22 --- pkgs/by-name/fi/files-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index cd8a5efc1f33..e18913b0afbe 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.12.14"; + version = "2.12.22"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-3saSSEvX/KxMs3r3sVmdTQDAkwtqo8IYdTcPVhmeD18="; + hash = "sha256-xjHPlZenkxZCJ9KwjyWsrAd1LiQRRuS9Z2fsRdHV7eA="; }; - vendorHash = "sha256-yqg1Xd3tIe4LxPaghh+Rm3++Lugc1T7/EmbX0ZZMMxw="; + vendorHash = "sha256-JzIafJOSlZUWwewp6sJaM7x3U+vZMdY4gBx/NfI7p5I="; ldflags = [ "-s" From aaf596a69768093cbccfbbb2c499ddd2dca6e213 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Mon, 8 Jan 2024 09:28:45 +0100 Subject: [PATCH 43/95] doc: extend Go documentation --- doc/languages-frameworks/go.section.md | 149 +++++++++++++++++++++---- 1 file changed, 127 insertions(+), 22 deletions(-) diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md index 7f069c687ff1..7f151c76129f 100644 --- a/doc/languages-frameworks/go.section.md +++ b/doc/languages-frameworks/go.section.md @@ -1,26 +1,41 @@ # Go {#sec-language-go} -## Go modules {#ssec-language-go} +## Building Go modules with `buildGoModule` {#ssec-language-go} -The function `buildGoModule` builds Go programs managed with Go modules. It builds a [Go Modules](https://github.com/golang/go/wiki/Modules) through a two phase build: +The function `buildGoModule` builds Go programs managed with Go modules. It builds [Go Modules](https://github.com/golang/go/wiki/Modules) through a two phase build: -- An intermediate fetcher derivation. This derivation will be used to fetch all of the dependencies of the Go module. +- An intermediate fetcher derivation called `goModules`. This derivation will be used to fetch all the dependencies of the Go module. - A final derivation will use the output of the intermediate derivation to build the binaries and produce the final output. +### Attributes of `buildGoModule` {#buildgomodule-parameters} + +The `buildGoModule` function accepts the following parameters in addition to the [attributes accepted by both Go builders](#ssec-go-common-attributes): + +- `vendorHash`: is the hash of the output of the intermediate fetcher derivation (the dependencies of the Go modules). + + `vendorHash` can be set to `null`. + In that case, rather than fetching the dependencies, the dependencies already vendored in the `vendor` directory of the source repo will be used. + + To avoid updating this field when dependencies change, run `go mod vendor` in your source repo and set `vendorHash = null;`. + You can read more about [vendoring in the Go documentation](https://go.dev/ref/mod#vendoring). + + To obtain the actual hash, set `vendorHash = lib.fakeHash;` and run the build ([more details here](#sec-source-hashes)). +- `proxyVendor`: If `true`, the intermediate fetcher downloads dependencies from the + [Go module proxy](https://go.dev/ref/mod#module-proxy) (using `go mod download`) instead of vendoring them. The resulting + [module cache](https://go.dev/ref/mod#module-cache) is then passed to the final derivation. + + This is useful if your code depends on C code and `go mod tidy` does not include the needed sources to build or + if any dependency has case-insensitive conflicts which will produce platform-dependent `vendorHash` checksums. + + Defaults to `false`. +- `modPostBuild`: Shell commands to run after the build of the goModules executes `go mod vendor`, and before calculating fixed output derivation's `vendorHash`. + Note that if you change this attribute, you need to update `vendorHash` attribute. +- `modRoot`: The root directory of the Go module that contains the `go.mod` file. + Defaults to `./`, which is the root of `src`. + ### Example for `buildGoModule` {#ex-buildGoModule} -In the following is an example expression using `buildGoModule`, the following arguments are of special significance to the function: - -- `vendorHash`: is the hash of the output of the intermediate fetcher derivation. - - `vendorHash` can also be set to `null`. - In that case, rather than fetching the dependencies and vendoring them, the dependencies vendored in the source repo will be used. - - To avoid updating this field when dependencies change, run `go mod vendor` in your source repo and set `vendorHash = null;` - - To obtain the actual hash, set `vendorHash = lib.fakeHash;` and run the build ([more details here](#sec-source-hashes)). -- `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build or if any dependency has case-insensitive conflicts which will produce platform-dependent `vendorHash` checksums. -- `modPostBuild`: Shell commands to run after the build of the goModules executes `go mod vendor`, and before calculating fixed output derivation's `vendorHash`. Note that if you change this attribute, you need to update `vendorHash` attribute. +The following is an example expression using `buildGoModule`: ```nix pet = buildGoModule rec { @@ -51,7 +66,7 @@ The function `buildGoPackage` builds legacy Go programs, not supporting Go modul ### Example for `buildGoPackage` {#example-for-buildgopackage} -In the following is an example expression using buildGoPackage, the following arguments are of special significance to the function: +In the following is an example expression using `buildGoPackage`, the following arguments are of special significance to the function: - `goPackagePath` specifies the package's canonical Go import path. - `goDeps` is where the Go dependencies of a Go program are listed as a list of package source identified by Go import path. It could be imported as a separate `deps.nix` file for readability. The dependency data structure is described below. @@ -103,7 +118,7 @@ The `goDeps` attribute can be imported from a separate `nix` file that defines w ] ``` -To extract dependency information from a Go package in automated way use [go2nix](https://github.com/kamilchm/go2nix). It can produce complete derivation and `goDeps` file for Go programs. +To extract dependency information from a Go package in automated way use [go2nix (deprecated)](https://github.com/kamilchm/go2nix). It can produce complete derivation and `goDeps` file for Go programs. You may use Go packages installed into the active Nix profiles by adding the following to your ~/.bashrc: @@ -113,7 +128,7 @@ for p in $NIX_PROFILES; do done ``` -## Attributes used by the builders {#ssec-go-common-attributes} +## Attributes used by both builders {#ssec-go-common-attributes} Many attributes [controlling the build phase](#variables-controlling-the-build-phase) are respected by both `buildGoModule` and `buildGoPackage`. Note that `buildGoModule` reads the following attributes also when building the `vendor/` goModules fixed output derivation as well: @@ -124,11 +139,18 @@ Many attributes [controlling the build phase](#variables-controlling-the-build-p - [`postPatch`](#var-stdenv-postPatch) - [`preBuild`](#var-stdenv-preBuild) +To control test execution of the build derivation, the following attributes are of interest: + +- [`checkInputs`](#var-stdenv-checkInputs) +- [`preCheck`](#var-stdenv-preCheck) +- [`checkFlags`](#var-stdenv-checkFlags) + In addition to the above attributes, and the many more variables respected also by `stdenv.mkDerivation`, both `buildGoModule` and `buildGoPackage` respect Go-specific attributes that tweak them to behave slightly differently: ### `ldflags` {#var-go-ldflags} -Arguments to pass to the Go linker tool via the `-ldflags` argument of `go build`. The most common use case for this argument is to make the resulting executable aware of its own version. For example: +A string list of flags to pass to the Go linker tool via the `-ldflags` argument of `go build`. Possible values can be retrieved by running `go tool link --help`. +The most common use case for this argument is to make the resulting executable aware of its own version by injecting the value of string variable using the `-X` flag. For example: ```nix ldflags = [ @@ -139,7 +161,7 @@ Arguments to pass to the Go linker tool via the `-ldflags` argument of `go build ### `tags` {#var-go-tags} -Arguments to pass to the Go via the `-tags` argument of `go build`. For example: +A string list of [Go build tags (also called build constraints)](https://pkg.go.dev/cmd/go#hdr-Build_constraints) that are passed via the `-tags` argument of `go build`. These constraints control whether Go files from the source should be included in the build. For example: ```nix tags = [ @@ -148,18 +170,101 @@ Arguments to pass to the Go via the `-tags` argument of `go build`. For example: ]; ``` +Tags can also be set conditionally: + ```nix tags = [ "production" ] ++ lib.optionals withSqlite [ "sqlite" ]; ``` ### `deleteVendor` {#var-go-deleteVendor} -Removes the pre-existing vendor directory. This should only be used if the dependencies included in the vendor folder are broken or incomplete. +If set to `true`, removes the pre-existing vendor directory. This should only be used if the dependencies included in the vendor folder are broken or incomplete. ### `subPackages` {#var-go-subPackages} Specified as a string or list of strings. Limits the builder from building child packages that have not been listed. If `subPackages` is not specified, all child packages will be built. +Many Go projects keep the main package in a `cmd` directory. +Following example could be used to only build the example-cli and example-server binaries: + +```nix +subPackages = [ + "cmd/example-cli" + "cmd/example-server" +]; +``` + ### `excludedPackages` {#var-go-excludedPackages} -Specified as a string or list of strings. Causes the builder to skip building child packages that match any of the provided values. If `excludedPackages` is not specified, all child packages will be built. +Specified as a string or list of strings. Causes the builder to skip building child packages that match any of the provided values. + +### `CGO_ENABLED` {#var-go-CGO_ENABLED} + +When set to `0`, the [cgo](https://pkg.go.dev/cmd/cgo) command is disabled. As consequence, the build +program can't link against C libraries anymore, and the resulting binary is statically linked. + +When building with CGO enabled, Go will likely link some packages from the Go standard library against C libraries, +even when the target code does not explicitly call into C dependencies. With `CGO_ENABLED = 0;`, Go +will always use the Go native implementation of these internal packages. For reference see +[net](https://pkg.go.dev/net#hdr-Name_Resolution) and [os/user](https://pkg.go.dev/os/user#pkg-overview) packages. +Notice that the decision whether these packages should use native Go implementation or not can also be controlled +on a per package level using build tags (`tags`). In case CGO is disabled, these tags have no additional effect. + +When a Go program depends on C libraries, place those dependencies in `buildInputs`: + +```nix + buildInputs = [ + libvirt + libxml2 + ]; +``` + +`CGO_ENABLED` defaults to `1`. + +### `enableParallelBuilding` {#var-go-enableParallelBuilding} + +Whether builds and tests should run in parallel. + +Defaults to `true`. + +### `allowGoReference` {#var-go-allowGoReference} + +Whether the build result should be allowed to contain references to the Go tool chain. This might be needed for programs that are coupled with the compiler, but shouldn't be set without a good reason. + +Defaults to `false` + +## Controlling the Go environment {#ssec-go-environment} + +The Go build can be further tweaked by setting environment variables. In most cases, this isn't needed. Possible values can be found in the [Go documentation of accepted environment variables](https://pkg.go.dev/cmd/go#hdr-Environment_variables). Notice that some of these flags are set by the builder itself and should not be set explicitly. If in doubt, grep the implementation of the builder. + +## Skipping tests {#ssec-skip-go-tests} + +`buildGoModule` runs tests by default. Failing tests can be disabled using the `checkFlags` parameter. +This is done with the [`-skip` or `-run`](https://pkg.go.dev/cmd/go#hdr-Testing_flags) flags of the `go test` command. + +For example, only a selection of tests could be run with: + +```nix + # -run and -skip accept regular expressions + checkFlags = [ + "-run=^Test(Simple|Fast)$" + ]; +``` + +If a larger amount of tests should be skipped, the following pattern can be used: + +```nix + checkFlags = + let + # Skip tests that require network access + skippedTests = [ + "TestNetwork" + "TestDatabase/with_mysql" # exclude only the subtest + "TestIntegration" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; +``` + +To disable tests altogether, set `doCheck = false;`. +`buildGoPackage` does not execute tests by default. From 1f47dd3b9d79efc88cf22e70b4fb9811e5aa6b68 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sun, 14 Jan 2024 07:00:11 +0900 Subject: [PATCH 44/95] ldtk: 1.4.1 -> 1.5.2 --- pkgs/applications/editors/ldtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/ldtk/default.nix b/pkgs/applications/editors/ldtk/default.nix index 337bc3bc6dfa..12d1d624db2d 100644 --- a/pkgs/applications/editors/ldtk/default.nix +++ b/pkgs/applications/editors/ldtk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ldtk"; - version = "1.4.1"; + version = "1.5.2"; src = fetchurl { url = "https://github.com/deepnight/ldtk/releases/download/v${finalAttrs.version}/ubuntu-distribution.zip"; - hash = "sha256-Qt6ADyIbhuxFGh7IP1WwcsvMtjOUZoTd99GeWt5s4UM="; + hash = "sha256-/2exLVMdSnn/Rc2lL1ytDZ6NvYRJA6W+NT7gGzxm6Vc="; }; nativeBuildInputs = [ unzip makeWrapper copyDesktopItems appimage-run ]; From 50a49047e1ae37878e34b62abe5feee8eb84bca4 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 13 Jan 2024 22:00:56 +0000 Subject: [PATCH 45/95] seq66: enable Qt wrapper to fix plugin loading Without the change `qseq66` fails to load as: $ qseq66 qt.qpa.plugin: Could not find the Qt platform plugin "xcb" in "" This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem. While at it added `mainProgram`. --- pkgs/applications/audio/seq66/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/seq66/default.nix b/pkgs/applications/audio/seq66/default.nix index 14fc4075e377..8f47ab0b6a20 100644 --- a/pkgs/applications/audio/seq66/default.nix +++ b/pkgs/applications/audio/seq66/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, qttools, which -, alsa-lib, libjack2, liblo, qtbase +, alsa-lib, libjack2, liblo, qtbase, wrapQtAppsHook }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1jvra1wzlycfpvffnqidk264zw6fyl4fsghkw5256ldk22aalmq9"; }; - nativeBuildInputs = [ autoreconfHook pkg-config qttools which ]; + nativeBuildInputs = [ autoreconfHook pkg-config qttools which wrapQtAppsHook ]; buildInputs = [ alsa-lib libjack2 liblo qtbase ]; @@ -29,13 +29,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - dontWrapQtApps = true; - meta = with lib; { homepage = "https://github.com/ahlstromcj/seq66"; description = "Loop based midi sequencer with Qt GUI derived from seq24 and sequencer64"; license = licenses.gpl2Plus; maintainers = with maintainers; [ orivej ]; + mainProgram = "qseq66"; platforms = platforms.linux; }; } From dcfc878774bba2777725f5bfad266db6f3e6b3d3 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 13 Jan 2024 19:27:28 -0300 Subject: [PATCH 46/95] bluez-alsa: migrate to by-name --- .../default.nix => by-name/bl/bluez-alsa/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/bluetooth/bluez-alsa/default.nix => by-name/bl/bluez-alsa/package.nix} (100%) diff --git a/pkgs/tools/bluetooth/bluez-alsa/default.nix b/pkgs/by-name/bl/bluez-alsa/package.nix similarity index 100% rename from pkgs/tools/bluetooth/bluez-alsa/default.nix rename to pkgs/by-name/bl/bluez-alsa/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd4d17b5427b..da6c9d6bfd9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4446,8 +4446,6 @@ with pkgs; blockdiag = with python3Packages; toPythonApplication blockdiag; - bluez-alsa = callPackage ../tools/bluetooth/bluez-alsa { }; - bmon = callPackage ../tools/misc/bmon { }; boca = callPackage ../development/libraries/boca { }; From 55b99696bffc385c23e5b0b8b006b3b5f3396538 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 27 Dec 2023 13:19:53 -0300 Subject: [PATCH 47/95] bluez-alsa: refactor - lists in ASCIIbetical ordering - finalAttrs design pattern - add updater script - remove nested with - set meta.mainProgram - add AndersonTorres as maintainer --- pkgs/by-name/bl/bluez-alsa/package.nix | 80 ++++++++++++++++---------- 1 file changed, 50 insertions(+), 30 deletions(-) diff --git a/pkgs/by-name/bl/bluez-alsa/package.nix b/pkgs/by-name/bl/bluez-alsa/package.nix index 30ef73228b31..911efe4a5644 100644 --- a/pkgs/by-name/bl/bluez-alsa/package.nix +++ b/pkgs/by-name/bl/bluez-alsa/package.nix @@ -1,42 +1,62 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook -, alsa-lib, bluez, glib, sbc, dbus - -# optional, but useful utils -, readline, libbsd, ncurses - -# optional codecs -, aacSupport ? true, fdk_aac -# TODO: aptxSupport +{ lib +, stdenv +, aacSupport ? true +, alsa-lib +, autoreconfHook +, bluez +, dbus +, fdk_aac +, fetchFromGitHub +, gitUpdater +, glib +, libbsd +, ncurses +, pkg-config +, readline +, sbc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bluez-alsa"; version = "4.1.1"; src = fetchFromGitHub { owner = "Arkq"; repo = "bluez-alsa"; - rev = "v${version}"; - sha256 = "sha256-oGaYiSkOhqfjUl+mHTs3gqFcxli3cgkRtT6tbjy3ht0="; + rev = "v${finalAttrs.version}"; + hash = "sha256-oGaYiSkOhqfjUl+mHTs3gqFcxli3cgkRtT6tbjy3ht0="; }; - nativeBuildInputs = [ pkg-config autoreconfHook ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; buildInputs = [ - alsa-lib bluez glib sbc dbus - readline libbsd ncurses - ] - ++ lib.optional aacSupport fdk_aac; + alsa-lib + bluez + glib + sbc + dbus + readline + libbsd + ncurses + ] ++ lib.optionals aacSupport [ + fdk_aac + ]; configureFlags = [ - "--with-alsaplugindir=${placeholder "out"}/lib/alsa-lib" - "--with-dbusconfdir=${placeholder "out"}/share/dbus-1/system.d" - "--enable-rfcomm" - "--enable-hcitop" - ] - ++ lib.optional aacSupport "--enable-aac"; + (lib.enableFeature aacSupport "aac") + (lib.enableFeature true "hcitop") + (lib.enableFeature true "rfcomm") + (lib.withFeatureAs true "alsaplugindir" "${placeholder "out"}/lib/alsa-lib") + (lib.withFeatureAs true "dbusconfdir" "${placeholder "out"}/share/dbus-1/system.d") + ]; - meta = with lib; { + passthru.updateScript = gitUpdater { }; + + meta = { + homepage = "https://github.com/Arkq/bluez-alsa"; description = "Bluez 5 Bluetooth Audio ALSA Backend"; longDescription = '' Bluez-ALSA (BlueALSA) is an ALSA backend for Bluez 5 audio interface. @@ -57,10 +77,10 @@ stdenv.mkDerivation rec { BluezALSA if you disable `bluetooth-discover` and `bluez5-discover` modules in PA and configure it to play/capture sound over `bluealsa` PCM. ''; - homepage = src.meta.homepage; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.oxij ]; + license = with lib.licenses; [ mit ]; + mainProgram = "bluealsa"; + maintainers = with lib.maintainers; [ AndersonTorres oxij ]; + platforms = lib.platforms.linux; }; - -} +}) +# TODO: aptxSupport From 612ee1a5f003469d302c9a9b33ff597163c88d78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jan 2024 22:36:18 +0000 Subject: [PATCH 48/95] openmm: 8.1.0 -> 8.1.1 --- .../libraries/science/chemistry/openmm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/chemistry/openmm/default.nix b/pkgs/development/libraries/science/chemistry/openmm/default.nix index 94a88bbf819a..9b37f14f1403 100644 --- a/pkgs/development/libraries/science/chemistry/openmm/default.nix +++ b/pkgs/development/libraries/science/chemistry/openmm/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "openmm"; - version = "8.1.0"; + version = "8.1.1"; src = fetchFromGitHub { owner = "openmm"; repo = pname; rev = version; - hash = "sha256-uNAqjklgBWM2v2z6qu17ZMFO4gn3fsnYPxyGO++UtTw="; + hash = "sha256-pYWBniV1J+UZBOPPjuUxVevONHaclo+GvGBEpr7Zmxg="; }; # "This test is stochastic and may occassionally fail". It does. From d6d5c923f641510da94be1a09507a356be1bcc25 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 13 Jan 2024 22:51:53 +0000 Subject: [PATCH 49/95] mikmod: fix startup crash on `_FORTIFY_SOURCE=3` Without the change `mikmod` crashes at startup as: $ nix run nixpkgs#mikmod *** buffer overflow detected ***: terminated Aborted (core dumped) The change fixes `snprintf()` buffer size accounting by picking patch proposed for upstream inclusion: https://sourceforge.net/p/mikmod/patches/17/ --- pkgs/applications/audio/mikmod/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix index 4cc0fec2e2f6..bb604d6bade2 100644 --- a/pkgs/applications/audio/mikmod/default.nix +++ b/pkgs/applications/audio/mikmod/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libmikmod, ncurses }: +{ lib, stdenv, fetchurl, fetchpatch, libmikmod, ncurses }: stdenv.mkDerivation rec { pname = "mikmod"; @@ -9,6 +9,17 @@ stdenv.mkDerivation rec { sha256 = "1k54p8pn3jinha0f2i23ad15pf1pamibzcxjrbzjbklpcz1ipc6v"; }; + patches = [ + # Fix player startup crash due to stack overflow check: + # https://sourceforge.net/p/mikmod/patches/17/ + (fetchpatch { + name = "fortify-source-3.patch"; + url = "https://sourceforge.net/p/mikmod/patches/17/attachment/0001-mikmod-fix-startup-crash-on-_FROTIFY_SOURCE-3-system.patch"; + stripLen = 1; + hash = "sha256-YtbnLTsW3oYPo4r3fh3DUd3DD5ogWrCNlrDcneY03U0="; + }) + ]; + buildInputs = [ libmikmod ncurses ]; meta = { From 7247d16af6a32d5bdc176d0be4858be2ad463d1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sun, 7 Jan 2024 23:40:40 +0100 Subject: [PATCH 50/95] nixos/c2fmzq-server: allow setting bool settings to false --- nixos/modules/services/web-apps/c2fmzq-server.nix | 6 +++++- nixos/tests/c2fmzq.nix | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/c2fmzq-server.nix b/nixos/modules/services/web-apps/c2fmzq-server.nix index 54c4bf1b09ca..87938fe160e1 100644 --- a/nixos/modules/services/web-apps/c2fmzq-server.nix +++ b/nixos/modules/services/web-apps/c2fmzq-server.nix @@ -7,7 +7,11 @@ let argsFormat = { type = with lib.types; attrsOf (nullOr (oneOf [ bool int str ])); - generate = lib.cli.toGNUCommandLineShell { }; + generate = lib.cli.toGNUCommandLineShell { + mkBool = k: v: [ + "--${k}=${if v then "true" else "false"}" + ]; + }; }; in { options.services.c2fmzq-server = { diff --git a/nixos/tests/c2fmzq.nix b/nixos/tests/c2fmzq.nix index 59addbde24ed..0dd89f6881dd 100644 --- a/nixos/tests/c2fmzq.nix +++ b/nixos/tests/c2fmzq.nix @@ -12,6 +12,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { # make sure multiple freeform options evaluate allow-new-accounts = true; auto-approve-new-accounts = true; + licenses = false; }; }; environment = { @@ -74,5 +75,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { with subtest("Test that PWA is served"): msg = machine.succeed("curl -sSfL http://localhost:8080") assert "c2FmZQ" in msg, f"Could not find 'c2FmZQ' in the output:\n{msg}" + + with subtest("A setting with false value is properly passed"): + machine.succeed("systemctl show -p ExecStart --value c2fmzq-server.service | grep -F -- '--licenses=false'"); ''; }) From f6b3a10c2cabc9c2307f4eaf81f530100f6e8141 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jan 2024 00:01:41 +0000 Subject: [PATCH 51/95] python311Packages.command_runner: 1.5.2 -> 1.6.0 --- pkgs/development/python-modules/command_runner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/command_runner/default.nix b/pkgs/development/python-modules/command_runner/default.nix index dd3e95c490b3..67fef574f094 100644 --- a/pkgs/development/python-modules/command_runner/default.nix +++ b/pkgs/development/python-modules/command_runner/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "command_runner"; - version = "1.5.2"; + version = "1.6.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-jzTckxDQxY8nIvQE3l0RTfpOH8RVIylS3YN3izr7Ns8="; + sha256 = "sha256-lzt1UhhrPqQrBKsRmPhqhtOIfFlCteQqo6sZ6rOut0A="; }; propagatedBuildInputs = [ psutil ]; From 4422e611fe76cd1d692e3d9122b7249924ae713f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Sat, 9 Dec 2023 01:11:16 -0300 Subject: [PATCH 52/95] libpeas: Fix Python loader MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- pkgs/development/libraries/libpeas/default.nix | 13 +++++++++++++ pkgs/development/libraries/libpeas/fix-paths.patch | 14 ++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/libpeas/fix-paths.patch diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index 70d33d86ad19..f0b6023117d9 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, substituteAll , meson , ninja , pkg-config @@ -12,6 +13,7 @@ , gobject-introspection , python3 , ncurses +, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -25,6 +27,16 @@ stdenv.mkDerivation rec { sha256 = "KXy5wszNjoYXYj0aPoQVtFMLjlqJPjUnu/0e3RMje0w="; }; + patches = [ + # Make PyGObject’s gi library available. + (substituteAll { + src = ./fix-paths.patch; + pythonPaths = lib.concatMapStringsSep ", " (pkg: "'${pkg}/${python3.sitePackages}'") [ + python3.pkgs.pygobject3 + ]; + }) + ]; + depsBuildBuild = [ pkg-config ]; @@ -36,6 +48,7 @@ stdenv.mkDerivation rec { gettext gi-docgen gobject-introspection + wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/development/libraries/libpeas/fix-paths.patch b/pkgs/development/libraries/libpeas/fix-paths.patch new file mode 100644 index 000000000000..c54cdd8873f5 --- /dev/null +++ b/pkgs/development/libraries/libpeas/fix-paths.patch @@ -0,0 +1,14 @@ +diff --git a/loaders/python/peas-plugin-loader-python.c b/loaders/python/peas-plugin-loader-python.c +index 26edbf3..0d65ada 100644 +--- a/loaders/python/peas-plugin-loader-python.c ++++ b/loaders/python/peas-plugin-loader-python.c +@@ -248,6 +248,9 @@ peas_plugin_loader_python_initialize (PeasPluginLoader *loader) + goto python_init_error; + } + ++ /* Add PyGObject to path */ ++ PyRun_SimpleString("import site; import functools; functools.reduce(lambda k, p: site.addsitedir(p, k), [@pythonPaths@], site._init_pathinfo())"); ++ + /* Initialize PyGObject */ + pygobject_init (PYGOBJECT_MAJOR_VERSION, + PYGOBJECT_MINOR_VERSION, From a474fb8826bbe2e874a7e7bed64fb233a348bd4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Sat, 9 Dec 2023 01:11:31 -0300 Subject: [PATCH 53/95] libpeas2: Fix Python loader MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- pkgs/development/libraries/libpeas/2.x.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/libraries/libpeas/2.x.nix b/pkgs/development/libraries/libpeas/2.x.nix index 547d7f5c27ef..38e4fe055085 100644 --- a/pkgs/development/libraries/libpeas/2.x.nix +++ b/pkgs/development/libraries/libpeas/2.x.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, substituteAll , pkg-config , gi-docgen , gobject-introspection @@ -25,6 +26,16 @@ stdenv.mkDerivation rec { hash = "sha256-ndwdUfOGY9pN9SFjBRt7LOo6JCz67p9afhQPB4TIqnc="; }; + patches = [ + # Make PyGObject’s gi library available. + (substituteAll { + src = ./fix-paths.patch; + pythonPaths = lib.concatMapStringsSep ", " (pkg: "'${pkg}/${python3.sitePackages}'") [ + python3.pkgs.pygobject3 + ]; + }) + ]; + depsBuildBuild = [ pkg-config ]; From 678d82c7b567bcd2cb19883ee44a70d56b9cec8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Sat, 9 Dec 2023 00:55:36 -0300 Subject: [PATCH 54/95] rhythmbox: Remove pygobject3 from PYTHONPATH MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- pkgs/applications/audio/rhythmbox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 394ccc3b723d..9929a32aabbf 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix PYTHONPATH : "${python3.pkgs.pygobject3}/${python3.sitePackages}:$out/lib/rhythmbox/plugins/" + --prefix PYTHONPATH : "$out/lib/rhythmbox/plugins/" ) ''; From 6faa06862f2660d1e46020c5e1575c97f71f0650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Sat, 9 Dec 2023 00:56:05 -0300 Subject: [PATCH 55/95] gnome-builder: Do not set PYTHONPATH MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- pkgs/applications/editors/gnome-builder/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index fc3f3fd27474..da36d5f111f7 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -73,7 +73,6 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - python3.pkgs.wrapPython wrapGAppsHook4 ]; @@ -137,12 +136,8 @@ stdenv.mkDerivation rec { meson test --print-errorlogs ''; - pythonPath = with python3.pkgs; requiredPythonModules [ pygobject3 ]; - preFixup = '' - buildPythonPath "$out $pythonPath" gappsWrapperArgs+=( - --prefix PYTHONPATH : "$program_PYTHONPATH" # For sysprof-agent --prefix PATH : "${sysprof}/bin" ) From 8bb04333fabd283695173e941feb6ccadbad3555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Sat, 9 Dec 2023 00:57:05 -0300 Subject: [PATCH 56/95] astroid: Remove pygobject3 from PYTHONPATH MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- pkgs/applications/networking/mailreaders/astroid/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 739f45fd4ee9..518d47a9a40a 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { sed -i "s~ -geom 10x10~~g" src/config.cc ''; - pythonPath = with python3.pkgs; requiredPythonModules [ pygobject3 ] ++ extraPythonPackages; + pythonPath = with python3.pkgs; requiredPythonModules extraPythonPackages; preFixup = '' buildPythonPath "$out $pythonPath" gappsWrapperArgs+=( From 9172370874a4cfbfdc676c5ffd619aa341a41335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Sat, 9 Dec 2023 00:57:35 -0300 Subject: [PATCH 57/95] liferea: Do not set PYTHONPATH MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- .../networking/newsreaders/liferea/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index d7643a6f07e8..0851d0f30e79 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -73,14 +73,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - pythonPath = with python3Packages; [ - pygobject3 - pycairo - ]; - - preFixup = '' - buildPythonPath "$out $pythonPath" - gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH") + postFixup = '' + buildPythonPath ${python3Packages.pycairo} + patchPythonScript $out/lib/liferea/plugins/trayicon.py ''; passthru.updateScript = gitUpdater { From 0729a314c54a5fe16df8114dd33e1910aff50de0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Sat, 9 Dec 2023 00:59:00 -0300 Subject: [PATCH 58/95] xplayer: Patch dbus-python into plugin directly, remove pythonenv MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- pkgs/applications/video/xplayer/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/video/xplayer/default.nix b/pkgs/applications/video/xplayer/default.nix index 20a9772021a9..baa8fcb95be0 100644 --- a/pkgs/applications/video/xplayer/default.nix +++ b/pkgs/applications/video/xplayer/default.nix @@ -25,13 +25,6 @@ , xapp , yelp-tools }: -let - pythonenv = python3.withPackages (ps: [ - ps.pygobject3 - ps.dbus-python # For one plugin - ]); -in - stdenv.mkDerivation rec { pname = "xplayer"; version = "2.4.4"; @@ -66,6 +59,7 @@ stdenv.mkDerivation rec { intltool itstool pkg-config + python3.pkgs.wrapPython yelp-tools gobject-introspection ]; @@ -82,15 +76,15 @@ stdenv.mkDerivation rec { libpeas libxml2 libxplayer-plparser - pythonenv + python3 xapp # to satisfy configure script - pythonenv.pkgs.pygobject3 + python3.pkgs.pygobject3 ]; - postInstall = '' - wrapProgram $out/bin/xplayer \ - --prefix PATH : ${lib.makeBinPath [ pythonenv ]} + postFixup = '' + buildPythonPath ${python3.pkgs.dbus-python} + patchPythonScript $out/lib/xplayer/plugins/dbus/dbusservice.py ''; meta = with lib; { From 3a50e0e6cba81bca08cb203aee56a42f4db31d94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Sat, 9 Dec 2023 01:00:24 -0300 Subject: [PATCH 59/95] gnome.totem: Do not set PYTHONPATH MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- pkgs/desktops/gnome/core/totem/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/desktops/gnome/core/totem/default.nix b/pkgs/desktops/gnome/core/totem/default.nix index 24c637909a32..1f6755002f01 100644 --- a/pkgs/desktops/gnome/core/totem/default.nix +++ b/pkgs/desktops/gnome/core/totem/default.nix @@ -91,9 +91,7 @@ stdenv.mkDerivation rec { adwaita-icon-theme gnome-desktop gsettings-desktop-schemas - # for plug-ins python3Packages.pygobject3 - python3Packages.dbus-python ]; nativeCheckInputs = [ @@ -124,8 +122,6 @@ stdenv.mkDerivation rec { runHook postCheck ''; - wrapPrefixVariables = [ "PYTHONPATH" ]; - passthru = { updateScript = gnome.updateScript { packageName = "totem"; From 9d7136ff2abdc93000fe6070e4969dfc02379ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Sat, 9 Dec 2023 01:00:48 -0300 Subject: [PATCH 60/95] mate.pluma: Patch missing dependencies for plugins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- pkgs/desktops/mate/pluma/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index 665e1b49a436..ed7d54e9469b 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { itstool perl pkg-config + python3.pkgs.wrapPython wrapGAppsHook ]; @@ -47,6 +48,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + pythonPath = with python3.pkgs; [ + pycairo + six + ]; + + postFixup = '' + buildPythonPath "$pythonPath" + patchPythonScript $out/lib/pluma/plugins/snippets/Snippet.py + ''; + passthru.updateScript = mateUpdateScript { inherit pname; }; meta = with lib; { From bb5da6f82379f05c49c28cfc30fe981aa0236f93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jan 2024 03:05:08 +0000 Subject: [PATCH 61/95] python311Packages.django-cachalot: 2.6.1 -> 2.6.2 --- pkgs/development/python-modules/django-cachalot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/django-cachalot/default.nix b/pkgs/development/python-modules/django-cachalot/default.nix index 33d9e484f114..eca0cff7c8d3 100644 --- a/pkgs/development/python-modules/django-cachalot/default.nix +++ b/pkgs/development/python-modules/django-cachalot/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "django-cachalot"; - version = "2.6.1"; + version = "2.6.2"; format = "setuptools"; src = fetchFromGitHub { owner = "noripyt"; repo = "django-cachalot"; - rev = "v${version}"; - hash = "sha256-bCiIZkh02+7xL6aSWE9by+4dFDsanr0iXuO9QKpLOjw="; + rev = "refs/tags/v${version}"; + hash = "sha256-8sC0uvfnGh3rp6C9/GsEevVDxAiI6MafIBfUuvnPeas="; }; patches = [ From 8365f0e743db6425d0db3e8c780317511f3c4dde Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Sat, 13 Jan 2024 19:21:32 -0800 Subject: [PATCH 62/95] unbook: 0.7.3 -> 0.8.2 Diff: https://github.com/ludios/unbook/compare/0.7.3..0.8.2 --- pkgs/by-name/un/unbook/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/un/unbook/package.nix b/pkgs/by-name/un/unbook/package.nix index b567cad5dc5f..91b7d6600830 100644 --- a/pkgs/by-name/un/unbook/package.nix +++ b/pkgs/by-name/un/unbook/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "unbook"; - version = "0.7.3"; + version = "0.8.2"; src = fetchFromGitHub { owner = "ludios"; repo = "unbook"; rev = version; - hash = "sha256-KYnSIT/zIrbDFRWIaQRto0sPPmpJC8V7f00j4t/AsGQ="; + hash = "sha256-THCPJ4zOKSXKZDa5DuqpBfBKZ96TdFEuDMVw/HmO7Eo="; }; - cargoHash = "sha256-AjyeTFgjl3XLplo8w9jne5FyKd2EciwbAKKiaDshpcA="; + cargoHash = "sha256-EbSayNz9cPmMDQOaOiyQAYmtlnb+4jzbffm1On0BBxI="; nativeBuildInputs = [ makeWrapper ]; From 61f3d730c47da8dc4b115debd8983c457b15e89a Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 14 Jan 2024 03:20:34 +0000 Subject: [PATCH 63/95] roomeqwizard: 5.20.13 -> 5.30.4 --- pkgs/applications/audio/roomeqwizard/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/roomeqwizard/default.nix b/pkgs/applications/audio/roomeqwizard/default.nix index 97f9b4f02846..26a8d00071fe 100644 --- a/pkgs/applications/audio/roomeqwizard/default.nix +++ b/pkgs/applications/audio/roomeqwizard/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "roomeqwizard"; - version = "5.20.13"; + version = "5.30.4"; src = fetchurl { url = "https://www.roomeqwizard.com/installers/REW_linux_no_jre_${lib.replaceStrings [ "." ] [ "_" ] version}.sh"; - sha256 = "sha256-6zaBDOmQlyMRQ84j64oS7TMwcctT1PSbuQOUYY9QjvY="; + sha256 = "sha256-585xfNzhWFdtNS4E5BE84zjkWDr/p1Nu9CJ3nTJc7dw="; }; dontUnpack = true; @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${lib.makeBinPath [ coreutils gnused gawk ]} cp -r "$desktopItem/share/applications" $out/share/ - cp $out/share/roomeqwizard/.install4j/s_*.png "$out/share/icons/hicolor/256x256/apps/${pname}.png" + cp $out/share/roomeqwizard/.install4j/roomeqwizard.png "$out/share/icons/hicolor/256x256/apps/${pname}.png" ${lib.optionalString recommendedUdevRules ''echo "$udevRules" > $out/lib/udev/rules.d/90-roomeqwizard.rules''} @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { homepage = "https://www.roomeqwizard.com/"; license = licenses.unfree; platforms = platforms.all; - maintainers = with maintainers; [ zaninime ]; + maintainers = with maintainers; [ orivej zaninime ]; description = "Room Acoustics Software"; longDescription = '' REW is free software for room acoustic measurement, loudspeaker From b0ee9915ad1fb1db1a72b8db2ee58672a61331ad Mon Sep 17 00:00:00 2001 From: wackbyte Date: Sat, 13 Jan 2024 23:41:50 -0500 Subject: [PATCH 64/95] typst-live: 0.6.0 -> 0.7.0 --- pkgs/tools/typesetting/typst-live/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/typesetting/typst-live/default.nix b/pkgs/tools/typesetting/typst-live/default.nix index bb705c5ce96a..8968adbb5e1b 100644 --- a/pkgs/tools/typesetting/typst-live/default.nix +++ b/pkgs/tools/typesetting/typst-live/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "typst-live"; - version = "0.6.0"; + version = "0.7.0"; src = fetchCrate { inherit pname version; - hash = "sha256-8YndEqhIESC3Cbe4klQfkVqesNFeZ2g1oRd1VoVrMnE="; + hash = "sha256-9GhrWhT0mYU2OOeoHGd5XY7BKO/S7cKTnURXi9dF+IU="; }; - cargoHash = "sha256-62tBefXek6W01RfdPczXBuYhrLK+wG1YQ7va7FQmAhA="; + cargoHash = "sha256-KGwmTXkY2nv5oWwjs5ZLz6u3bJ7YWJQPqOqJJNxKDkM="; nativeBuildInputs = [ makeWrapper From 1db693c304bc5590a1516fcc20b92207dc6f2c5a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jan 2024 06:56:19 +0000 Subject: [PATCH 65/95] python311Packages.django-vite: 3.0.1 -> 3.0.2 --- pkgs/development/python-modules/django-vite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-vite/default.nix b/pkgs/development/python-modules/django-vite/default.nix index beb49f409270..5f4ee952e2f1 100644 --- a/pkgs/development/python-modules/django-vite/default.nix +++ b/pkgs/development/python-modules/django-vite/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "django-vite"; - version = "3.0.1"; + version = "3.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "MrBin99"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-S7n14nv6DZgusntVXh65PM/oaYZGCxaFylPbVXxmLj4="; + hash = "sha256-Lnecxkn+E1Bce/EhP1AHH9/VrdzBiMGLv+eYld5+QKM="; }; propagatedBuildInputs = [ From 1366434ba6878a94b4fdc7764d08625f13c767d9 Mon Sep 17 00:00:00 2001 From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> Date: Sun, 14 Jan 2024 08:13:32 +0000 Subject: [PATCH 66/95] python311Packages.astropy-healpix: remove patch; fix build --- .../python-modules/astropy-healpix/default.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/development/python-modules/astropy-healpix/default.nix b/pkgs/development/python-modules/astropy-healpix/default.nix index c08146363217..b25fb6e9eb43 100644 --- a/pkgs/development/python-modules/astropy-healpix/default.nix +++ b/pkgs/development/python-modules/astropy-healpix/default.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchPypi -, fetchpatch , numpy , astropy , astropy-extension-helpers @@ -24,16 +23,6 @@ buildPythonPackage rec { hash = "sha256-74k4vfcpdXw4CowXNHlNc3StAOB2f8Si+mOma+8SYkI="; }; - patches = [ - # remove on next udpate. make Numpy loop function args const correct. - # https://github.com/astropy/astropy-healpix/pull/199 - (fetchpatch { - name = "numpy-const-args-match.patch"; - url = "https://github.com/astropy/astropy-healpix/commit/ccf6d9ea4be131f56646adbd7bc482bfcd84f21c.patch"; - hash = "sha256-fpDxTbs3sHJSb4mnveorM+wlseXbZu1biGyBTNC9ZUo="; - }) - ]; - nativeBuildInputs = [ astropy-extension-helpers setuptools From ed147dbbd54bfa6a187aff62661261771ca497bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jan 2024 02:53:21 +0000 Subject: [PATCH 67/95] python311Packages.diffusers: 0.24.0 -> 0.25.0 --- pkgs/development/python-modules/diffusers/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/diffusers/default.nix b/pkgs/development/python-modules/diffusers/default.nix index 5bcda2b40d7d..2d2c901a5016 100644 --- a/pkgs/development/python-modules/diffusers/default.nix +++ b/pkgs/development/python-modules/diffusers/default.nix @@ -21,6 +21,7 @@ , jax , jaxlib , jinja2 +, peft , protobuf , tensorboard , torch @@ -38,7 +39,7 @@ buildPythonPackage rec { pname = "diffusers"; - version = "0.24.0"; + version = "0.25.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -47,7 +48,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "diffusers"; rev = "refs/tags/v${version}"; - hash = "sha256-ccWF8hQzPhFY/kqRum2tbanI+cQiT25MmvPZN+hGadc="; + hash = "sha256-3IwBZWSbAMaOo76rUejt4YG7PA0RMLq4LYkNB6SvK6k="; }; nativeBuildInputs = [ @@ -80,6 +81,7 @@ buildPythonPackage rec { accelerate datasets jinja2 + peft protobuf tensorboard ]; From 9ab154949f583c9926fa2ac1aa58564d7c0a4536 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Jan 2024 10:26:13 +0100 Subject: [PATCH 68/95] python311Packages.aiotractive: 0.5.6 -> 0.5.7 Diff: https://github.com/zhulik/aiotractive/compare/v0.5.6...v0.5.7 Changelog: https://github.com/zhulik/aiotractive/releases/tag/v0.5.7 --- pkgs/development/python-modules/aiotractive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiotractive/default.nix b/pkgs/development/python-modules/aiotractive/default.nix index 08fba4272c87..6eca100d507a 100644 --- a/pkgs/development/python-modules/aiotractive/default.nix +++ b/pkgs/development/python-modules/aiotractive/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiotractive"; - version = "0.5.6"; + version = "0.5.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "zhulik"; repo = pname; rev = "v${version}"; - hash = "sha256-jJw1L1++Z/r+E12tA6zoyyy4MmTpaaVVzKwfI6xcDBQ="; + hash = "sha256-fIdIFG1OpAN1R2L2RryTzYZyqGLo3tqAAkRC8UUFM4k="; }; propagatedBuildInputs = [ From ca904d847ef0f51fbeafbf1368ead6819ec84d20 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Jan 2024 10:28:29 +0100 Subject: [PATCH 69/95] python311Packages.aiotractive: refactor --- .../python-modules/aiotractive/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aiotractive/default.nix b/pkgs/development/python-modules/aiotractive/default.nix index 6eca100d507a..4af4f9618784 100644 --- a/pkgs/development/python-modules/aiotractive/default.nix +++ b/pkgs/development/python-modules/aiotractive/default.nix @@ -3,22 +3,28 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools , yarl }: buildPythonPackage rec { pname = "aiotractive"; version = "0.5.7"; - format = "setuptools"; + pyproject = true; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "zhulik"; - repo = pname; - rev = "v${version}"; + repo = "aiotractive"; + rev = "refs/tags/v${version}"; hash = "sha256-fIdIFG1OpAN1R2L2RryTzYZyqGLo3tqAAkRC8UUFM4k="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp yarl @@ -27,7 +33,9 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "aiotractive" ]; + pythonImportsCheck = [ + "aiotractive" + ]; meta = with lib; { changelog = "https://github.com/zhulik/aiotractive/releases/tag/v${version}"; From 1a7e63652208c1423c19bcbf9e86103b622a17f5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Jan 2024 10:38:24 +0100 Subject: [PATCH 70/95] python311Packages.opower: 0.1.0 -> 0.2.0 Diff: https://github.com/tronikos/opower/compare/refs/tags/v0.1.0...v0.2.0 Changelog: https://github.com/tronikos/opower/releases/tag/v0.2.0 --- pkgs/development/python-modules/opower/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index f3e3828965d1..dee20aaf2a58 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "opower"; - version = "0.1.0"; + version = "0.2.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-218AQ++ndwfS9wStWF7Zcn12gyoy5K7PAwv0HDGqbww="; + hash = "sha256-OT+QCbHQbL3vCfPuyzxBKqUJ2EtFn+PslrKGlrC6Ip8="; }; pythonRemoveDeps = [ From 217cc2b9fb5fd7d80e0a9b0c02b18f43d789f0fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jan 2024 09:38:28 +0000 Subject: [PATCH 71/95] python311Packages.epion: 0.0.2 -> 0.0.3 --- pkgs/development/python-modules/epion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/epion/default.nix b/pkgs/development/python-modules/epion/default.nix index 3f3a88f2fd43..945c65554d3a 100644 --- a/pkgs/development/python-modules/epion/default.nix +++ b/pkgs/development/python-modules/epion/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "epion"; - version = "0.0.2"; + version = "0.0.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "devenzo-com"; repo = "epion_python"; rev = "refs/tags/${version}"; - hash = "sha256-XyYjbr0EPRrwWsXhZT2oWcoDPZoZCuT9aZ2UHSSt0E8="; + hash = "sha256-9tE/SqR+GHZXeE+bOtXkLu+4jy1vO8WoiLjb6MJazxQ="; }; nativeBuildInputs = [ From 572c9e5aa83ba7f2502d88afd785cdda0c52fa80 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jan 2024 09:39:31 +0000 Subject: [PATCH 72/95] python311Packages.fireflyalgorithm: 0.3.4 -> 0.4.4 --- pkgs/development/python-modules/fireflyalgorithm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fireflyalgorithm/default.nix b/pkgs/development/python-modules/fireflyalgorithm/default.nix index cabee97bed9c..c052cf07c67a 100644 --- a/pkgs/development/python-modules/fireflyalgorithm/default.nix +++ b/pkgs/development/python-modules/fireflyalgorithm/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "FireflyAlgorithm"; - version = "0.3.4"; + version = "0.4.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rJOcPQU/oz/qP787OpZsfbjSsT2dWvhJLTs4N5TriWc="; + hash = "sha256-xsTgSHBtN4gGw+9YvprcLubnCXSNRdn4abcz391cMEE="; }; nativeBuildInputs = [ From cfa3f2b8f6956079ee41a843bffad834bbe09448 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Jan 2024 10:40:28 +0100 Subject: [PATCH 73/95] python311Packages.opower: refactor --- pkgs/development/python-modules/opower/default.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index dee20aaf2a58..9c35a3c5491f 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -6,14 +6,13 @@ , pyotp , pytestCheckHook , pythonOlder -, pythonRelaxDepsHook , setuptools }: buildPythonPackage rec { pname = "opower"; version = "0.2.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -24,13 +23,7 @@ buildPythonPackage rec { hash = "sha256-OT+QCbHQbL3vCfPuyzxBKqUJ2EtFn+PslrKGlrC6Ip8="; }; - pythonRemoveDeps = [ - # https://github.com/tronikos/opower/pull/4 - "asyncio" - ]; - nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; From 5a65ef7fc6b1085df94f7e563ad43a892545a735 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jan 2024 10:46:21 +0000 Subject: [PATCH 74/95] python311Packages.garth: 0.4.43 -> 0.4.44 --- pkgs/development/python-modules/garth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix index 6c3ba969308f..df0a5fbbad93 100644 --- a/pkgs/development/python-modules/garth/default.nix +++ b/pkgs/development/python-modules/garth/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "garth"; - version = "0.4.43"; + version = "0.4.44"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-PlHyyXsB79wsEvZY4CmpX4ohCQUjz+ogmHOtIxEhIcc="; + hash = "sha256-CgLWstmhWXI2w6KBSpIGp8G1smWAKXC0goHKw3I9rJ4="; }; nativeBuildInputs = [ From e467119a1565ccf9ca150820ae82661e7ad331bc Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Sun, 14 Jan 2024 16:33:24 +0530 Subject: [PATCH 75/95] iwd: 2.12 -> 2.13 Signed-off-by: Muhammad Falak R Wani --- pkgs/os-specific/linux/iwd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index dab2f2290fc1..762678141bde 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "2.12"; + version = "2.13"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - hash = "sha256-XlhzPEXYGmJvQ6ZfPK1nxbHibXLdNsDKhZ0UAIRmN6U="; + hash = "sha256-Nyp7Gm3JK6bLzAZxuEjxKnzAK/eAYUO5owMbG90WQ8E="; }; outputs = [ "out" "man" "doc" ] From 8dcf8f9572124f18f171d8336ace9862f3daa6dc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Jan 2024 12:25:33 +0100 Subject: [PATCH 76/95] python311Packages.garth: add changelog to meta --- pkgs/development/python-modules/garth/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix index df0a5fbbad93..f6612811a692 100644 --- a/pkgs/development/python-modules/garth/default.nix +++ b/pkgs/development/python-modules/garth/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "garth"; version = "0.4.44"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -59,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Garmin SSO auth and connect client"; homepage = "https://github.com/matin/garth"; + changelog = "https://github.com/matin/garth/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 69d191aeafedfb86d691200357fe1e8c4aa0f51e Mon Sep 17 00:00:00 2001 From: geri1701 Date: Sun, 14 Jan 2024 12:44:57 +0100 Subject: [PATCH 77/95] amdgpu_top: 0.3.1 -> 0.6.1 --- pkgs/tools/system/amdgpu_top/Cargo.lock | 596 +++++++++++++---------- pkgs/tools/system/amdgpu_top/default.nix | 6 +- 2 files changed, 349 insertions(+), 253 deletions(-) diff --git a/pkgs/tools/system/amdgpu_top/Cargo.lock b/pkgs/tools/system/amdgpu_top/Cargo.lock index f19bf1d67a41..7905f0a57f32 100644 --- a/pkgs/tools/system/amdgpu_top/Cargo.lock +++ b/pkgs/tools/system/amdgpu_top/Cargo.lock @@ -20,9 +20,9 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "accesskit" -version = "0.11.2" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eb1adf08c5bcaa8490b9851fd53cca27fa9880076f178ea9d29f05196728a8" +checksum = "ca8410747ed85a17c4a1e9ed3f5a74d3e7bdcc876cf9a18ff40ae21d645997b2" dependencies = [ "enumn", "serde", @@ -36,9 +36,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", "getrandom", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "amdgpu_top" -version = "0.3.1" +version = "0.6.1" dependencies = [ "amdgpu_top_gui", "amdgpu_top_json", @@ -70,7 +70,7 @@ dependencies = [ [[package]] name = "amdgpu_top_gui" -version = "0.3.1" +version = "0.6.1" dependencies = [ "eframe", "egui_plot", @@ -83,7 +83,7 @@ dependencies = [ [[package]] name = "amdgpu_top_json" -version = "0.3.1" +version = "0.6.1" dependencies = [ "libamdgpu_top", "serde_json", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "amdgpu_top_tui" -version = "0.3.1" +version = "0.6.1" dependencies = [ "cursive", "libamdgpu_top", @@ -123,15 +123,15 @@ checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "ca87830a3e3fb156dc96cfbd31cb620265dd053be734723f22b760d6cc3c3051" [[package]] name = "arboard" -version = "3.2.1" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac57f2b058a76363e357c056e4f74f1945bf734d37b8b3ef49066c4787dde0fc" +checksum = "aafb29b107435aa276664c1db8954ac27a6e105cdad3c88287a199eb0e313c08" dependencies = [ "clipboard-win", "log", @@ -213,9 +213,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" +checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" dependencies = [ "memchr", "regex-automata", @@ -254,7 +254,7 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", ] [[package]] @@ -385,9 +385,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -395,9 +395,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" @@ -414,9 +414,9 @@ dependencies = [ [[package]] name = "core-graphics-types" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -443,9 +443,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "82a9b73a36529d9c47029b9fb3a6f0ea3cc916a261195352ba19e770fc1748b2" dependencies = [ "cfg-if", "crossbeam-utils", @@ -453,9 +453,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" dependencies = [ "cfg-if", ] @@ -554,7 +554,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", ] [[package]] @@ -565,7 +565,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.39", + "syn 2.0.44", ] [[package]] @@ -583,9 +583,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", ] @@ -635,7 +635,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", ] [[package]] @@ -661,9 +661,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "ecolor" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfdf4e52dbbb615cfd30cf5a5265335c217b5fd8d669593cea74a517d9c605af" +checksum = "4b7637fc2e74d17e52931bac90ff4fc061ac776ada9c7fa272f24cdca5991972" dependencies = [ "bytemuck", "serde", @@ -671,9 +671,9 @@ dependencies = [ [[package]] name = "eframe" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d9efede6c8905d3fc51a5ec9a506d4da4011bbcae0253d0304580fe40af3f5" +checksum = "cdd73918a828c35a7efb4d7188ea973df4bffc589178ed95f521c917b03ddcfa" dependencies = [ "bytemuck", "cocoa", @@ -704,9 +704,9 @@ dependencies = [ [[package]] name = "egui" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd69fed5fcf4fbb8225b24e80ea6193b61e17a625db105ef0c4d71dde6eb8b7" +checksum = "c55bcb864b764eb889515a38b8924757657a250738ad15126637ee2df291ee6b" dependencies = [ "accesskit", "ahash", @@ -719,9 +719,9 @@ dependencies = [ [[package]] name = "egui-winit" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15479a96d9fadccf5dac690bdc6373b97b8e1c0dd28367058f25a5298da0195" +checksum = "3b673606b6606b12b95e3a3194d7882bf5cff302db36a520b8144c7c342e4e84" dependencies = [ "arboard", "egui", @@ -736,33 +736,33 @@ dependencies = [ [[package]] name = "egui_glow" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6726c08798822280038bbad2e32f4fc3cbed800cd51c6e34e99cd2d60cc1bc" +checksum = "262151f9d57c557c02a40a46f27b9e050a6eb0b006b94dced9c6f4519a04d489" dependencies = [ "bytemuck", "egui", "glow", "log", - "memoffset", + "memoffset 0.7.1", "wasm-bindgen", "web-sys", ] [[package]] name = "egui_plot" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f33a00fe8eb1ba56535b3dbacdecc7a1365a328908a97c5f3c81bb466be72b" +checksum = "b37b2edcdd197db41825266ae7979bd7591fa2eb6b40152375ac05eb323eb9d2" dependencies = [ "egui", ] [[package]] name = "emath" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ef2b29de53074e575c18b694167ccbe6e5191f7b25fe65175a0d905a32eeec0" +checksum = "a045c6c0b44b35e98513fc1e9d183ab42881ac27caccb9fa345465601f56cce4" dependencies = [ "bytemuck", "serde", @@ -770,22 +770,22 @@ dependencies = [ [[package]] name = "enum-map" -version = "2.7.1" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed40247825a1a0393b91b51d475ea1063a6cbbf0847592e7f13fb427aca6a716" +checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9" dependencies = [ "enum-map-derive", ] [[package]] name = "enum-map-derive" -version = "0.15.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7933cd46e720348d29ed1493f89df9792563f272f96d8f13d18afe03b32f8cb8" +checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", ] [[package]] @@ -796,7 +796,7 @@ checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", ] [[package]] @@ -817,14 +817,14 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", ] [[package]] name = "epaint" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58067b840d009143934d91d8dcb8ded054d8301d7c11a517ace0a99bb1e1595e" +checksum = "7d1b9e000d21bab9b535ce78f9f7745be28b3f777f6c7223936561c5c7fefab8" dependencies = [ "ab_glyph", "ahash", @@ -845,12 +845,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -865,9 +865,9 @@ dependencies = [ [[package]] name = "faster-hex" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239f7bfb930f820ab16a9cd95afc26f88264cf6905c960b340a615384aa3338a" +checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" dependencies = [ "serde", ] @@ -880,9 +880,9 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" +checksum = "209098dd6dfc4445aa6111f0e98653ac323eaa4dfd212c9ca3931bf9955c31bd" dependencies = [ "simd-adler32", ] @@ -927,7 +927,7 @@ dependencies = [ "intl-memoizer", "intl_pluralrules", "rustc-hash", - "self_cell", + "self_cell 0.10.3", "smallvec", "unic-langid", ] @@ -973,9 +973,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -992,9 +992,9 @@ dependencies = [ [[package]] name = "gethostname" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" dependencies = [ "libc", "winapi", @@ -1054,9 +1054,9 @@ dependencies = [ [[package]] name = "gix-actor" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "948a5f9e43559d16faf583694f1c742eb401ce24ce8e6f2238caedea7486433c" +checksum = "2eadca029ef716b4378f7afb19f7ee101fde9e58ba1f1445971315ac866db417" dependencies = [ "bstr", "btoi", @@ -1068,24 +1068,24 @@ dependencies = [ [[package]] name = "gix-chunk" -version = "0.4.4" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b42ea64420f7994000130328f3c7a2038f639120518870436d31b8bde704493" +checksum = "003ec6deacf68076a0c157271a127e0bb2c031c1a41f7168cbe5d248d9b85c78" dependencies = [ "thiserror", ] [[package]] name = "gix-commitgraph" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8bc78b1a6328fa6d8b3a53b6c73997af37fd6bfc1d6c49f149e63bda5cbb36" +checksum = "85a7007ba021f059803afaf6f8a48872422abc20550ac12ede6ddea2936cec36" dependencies = [ "bstr", "gix-chunk", "gix-features", "gix-hash", - "memmap2 0.7.1", + "memmap2 0.9.3", "thiserror", ] @@ -1112,9 +1112,9 @@ dependencies = [ [[package]] name = "gix-config-value" -version = "0.14.0" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea7505b97f4d8e7933e29735a568ba2f86d8de466669d9f0e8321384f9972f47" +checksum = "52e0be46f4cf1f8f9e88d0e3eb7b29718aff23889563249f379119bd1ab6910e" dependencies = [ "bitflags 2.4.1", "bstr", @@ -1125,9 +1125,9 @@ dependencies = [ [[package]] name = "gix-date" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7df669639582dc7c02737642f76890b03b5544e141caba68a7d6b4eb551e0d" +checksum = "fb7f3dfb72bebe3449b5e642be64e3c6ccbe9821c8b8f19f487cf5bfbbf4067e" dependencies = [ "bstr", "itoa", @@ -1163,9 +1163,9 @@ dependencies = [ [[package]] name = "gix-features" -version = "0.36.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f4365ba17c4f218d7fd9ec102b8d2d3cb0ca200a835e81151ace7778aec827" +checksum = "4d46a4a5c6bb5bebec9c0d18b65ada20e6517dbd7cf855b87dd4bbdce3a771b2" dependencies = [ "crc32fast", "flate2", @@ -1181,18 +1181,18 @@ dependencies = [ [[package]] name = "gix-fs" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd171c0cae97cd0dc57e7b4601cb1ebf596450e263ef3c02be9107272c877bd" +checksum = "20e86eb040f5776a5ade092282e51cdcad398adb77d948b88d17583c2ae4e107" dependencies = [ "gix-features", ] [[package]] name = "gix-glob" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fac08925dbc14d414bd02eb45ffb4cecd912d1fce3883f867bd0103c192d3e4" +checksum = "5db19298c5eeea2961e5b3bf190767a2d1f09b8802aeb5f258e42276350aff19" dependencies = [ "bitflags 2.4.1", "bstr", @@ -1202,9 +1202,9 @@ dependencies = [ [[package]] name = "gix-hash" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1884c7b41ea0875217c1be9ce91322f90bde433e91d374d0e1276073a51ccc60" +checksum = "1f8cf8c2266f63e582b7eb206799b63aa5fa68ee510ad349f637dfe2d0653de0" dependencies = [ "faster-hex", "thiserror", @@ -1212,9 +1212,9 @@ dependencies = [ [[package]] name = "gix-hashtable" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "409268480841ad008e81c17ca5a293393fbf9f2b6c2f85b8ab9de1f0c5176a16" +checksum = "feb61880816d7ec4f0b20606b498147d480860ddd9133ba542628df2f548d3ca" dependencies = [ "gix-hash", "hashbrown", @@ -1223,9 +1223,9 @@ dependencies = [ [[package]] name = "gix-lock" -version = "11.0.0" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4feb1dcd304fe384ddc22edba9dd56a42b0800032de6537728cea2f033a4f37" +checksum = "7e5c65e6a29830a435664891ced3f3c1af010f14900226019590ee0971a22f37" dependencies = [ "gix-tempfile", "gix-utils", @@ -1234,13 +1234,13 @@ dependencies = [ [[package]] name = "gix-macros" -version = "0.1.0" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d8acb5ee668d55f0f2d19a320a3f9ef67a6999ad483e11135abcc2464ed18b6" +checksum = "d75e7ab728059f595f6ddc1ad8771b8d6a231971ae493d9d5948ecad366ee8bb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", ] [[package]] @@ -1303,9 +1303,9 @@ dependencies = [ [[package]] name = "gix-path" -version = "0.10.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a1d370115171e3ae03c5c6d4f7d096f2981a40ddccb98dfd704c773530ba73b" +checksum = "b8dd0998ab245f33d40ca2267e58d542fe54185ebd1dc41923346cf28d179fb6" dependencies = [ "bstr", "gix-trace", @@ -1316,9 +1316,9 @@ dependencies = [ [[package]] name = "gix-quote" -version = "0.4.7" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "475c86a97dd0127ba4465fbb239abac9ea10e68301470c9791a6dd5351cdc905" +checksum = "9f7dc10303d73a960d10fb82f81188b036ac3e6b11b5795b20b1a60b51d1321f" dependencies = [ "bstr", "btoi", @@ -1393,9 +1393,9 @@ dependencies = [ [[package]] name = "gix-sec" -version = "0.10.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92b9542ac025a8c02ed5d17b3fc031a111a384e859d0be3532ec4d58c40a0f28" +checksum = "78f6dce0c6683e2219e8169aac4b1c29e89540a8262fef7056b31d80d969408c" dependencies = [ "bitflags 2.4.1", "gix-path", @@ -1405,9 +1405,9 @@ dependencies = [ [[package]] name = "gix-tempfile" -version = "11.0.0" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05cc2205cf10d99f70b96e04e16c55d4c7cf33efc151df1f793e29fd12a931f8" +checksum = "388dd29114a86ec69b28d1e26d6d63a662300ecf61ab3f4cc578f7d7dc9e7e23" dependencies = [ "gix-fs", "libc", @@ -1418,9 +1418,9 @@ dependencies = [ [[package]] name = "gix-trace" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b6d623a1152c3facb79067d6e2ecdae48130030cf27d6eb21109f13bd7b836" +checksum = "e8e1127ede0475b58f4fe9c0aaa0d9bb0bad2af90bbd93ccd307c8632b863d89" [[package]] name = "gix-traverse" @@ -1440,9 +1440,9 @@ dependencies = [ [[package]] name = "gix-url" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1b9ac8ed32ad45f9fc6c5f8c0be2ed911e544a5a19afd62d95d524ebaa95671" +checksum = "0c427a1a11ccfa53a4a2da47d9442c2241deee63a154bc15cc14b8312fbc4005" dependencies = [ "bstr", "gix-features", @@ -1454,18 +1454,18 @@ dependencies = [ [[package]] name = "gix-utils" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b85d89dc728613e26e0ed952a19583744e7f5240fcd4aa30d6c824ffd8b52f0f" +checksum = "de6225e2de30b6e9bca2d9f1cc4731640fcef0fb3cabddceee366e7e85d3e94f" dependencies = [ "fastrand", ] [[package]] name = "gix-validate" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05cab2b03a45b866156e052aa38619f4ece4adcb2f79978bfc249bc3b21b8c5" +checksum = "ac7cc36f496bd5d96cdca0f9289bb684480725d40db60f48194aa7723b883854" dependencies = [ "bstr", "thiserror", @@ -1560,17 +1560,17 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1626,21 +1626,21 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.39", + "syn 2.0.44", "unic-langid", ] [[package]] name = "i18n-embed-impl" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2a4d5bff745c9a6e1459c490059281b353a4ab0a4e1e58b3eeeaef71f97d07b" +checksum = "81093c4701672f59416582fe3145676126fd23ba5db910acad0793c1108aaa58" dependencies = [ "find-crate", "i18n-config", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", ] [[package]] @@ -1651,9 +1651,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1716,9 +1716,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jni" @@ -1753,9 +1753,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.65" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] @@ -1774,7 +1774,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libamdgpu_top" -version = "0.3.1" +version = "0.6.1" dependencies = [ "anyhow", "libdrm_amdgpu_sys", @@ -1782,14 +1782,14 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.150" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libdrm_amdgpu_sys" -version = "0.2.2" -source = "git+https://github.com/Umio-Yasuno/libdrm-amdgpu-sys-rs#39b31fd54578d332f8085c033a1ef073b627be6e" +version = "0.4.1" +source = "git+https://github.com/Umio-Yasuno/libdrm-amdgpu-sys-rs#d2e0bd7d1dd822b95789842d96e183ae1bb31aeb" dependencies = [ "libc", ] @@ -1838,9 +1838,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "locale_config" @@ -1882,9 +1882,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memmap2" @@ -1904,6 +1904,15 @@ dependencies = [ "libc", ] +[[package]] +name = "memmap2" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92" +dependencies = [ + "libc", +] + [[package]] name = "memoffset" version = "0.6.5" @@ -1914,10 +1923,13 @@ dependencies = [ ] [[package]] -name = "minimal-lexical" -version = "0.2.1" +name = "memoffset" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] [[package]] name = "miniz_oxide" @@ -1931,9 +1943,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "log", @@ -1979,7 +1991,7 @@ dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "memoffset", + "memoffset 0.6.5", ] [[package]] @@ -1992,7 +2004,19 @@ dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "memoffset", + "memoffset 0.6.5", +] + +[[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 0.7.1", ] [[package]] @@ -2001,16 +2025,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - [[package]] name = "num" version = "0.4.1" @@ -2113,7 +2127,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", ] [[package]] @@ -2182,9 +2196,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "orbclient" @@ -2238,15 +2252,15 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" [[package]] name = "png" @@ -2303,9 +2317,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "2dd5e8a1f1029c43224ad5898e50140c2aebb1705f19e67c918ebf5b9e797fe1" dependencies = [ "unicode-ident", ] @@ -2318,9 +2332,9 @@ checksum = "794b5bf8e2d19b53dcdcec3e4bba628e20f5b6062503ba89281fa7037dd7bbcf" [[package]] name = "quote" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "22a37c9326af5ed140c86a46655b5278de879853be5573c01df185b6f49a580a" dependencies = [ "proc-macro2", ] @@ -2403,9 +2417,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "8.0.0" +version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e7d90385b59f0a6bf3d3b757f3ca4ece2048265d70db20a2016043d4509a40" +checksum = "a82c0bbc10308ed323529fd3c1dce8badda635aa319a5ff0e6466f33b8101e3f" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -2414,22 +2428,22 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.0.0" +version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3d8c6fd84090ae348e63a84336b112b5c3918b3bf0493a581f7bd8ee623c29" +checksum = "6227c01b1783cdfee1bcf844eb44594cd16ec71c35305bf1c9fb5aade2735e16" dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.39", + "syn 2.0.44", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "8.0.0" +version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "873feff8cb7bf86fdf0a71bb21c95159f4e4a37dd7a4bd1855a940909b583ada" +checksum = "8cb0a25bfbb2d4b4402179c2cf030387d9990857ce08a32592c6238db9fa8665" dependencies = [ "sha2", "walkdir", @@ -2443,22 +2457,22 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.21" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "same-file" @@ -2483,35 +2497,44 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "self_cell" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" +checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" +dependencies = [ + "self_cell 1.0.3", +] + +[[package]] +name = "self_cell" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" [[package]] name = "serde" -version = "1.0.192" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.192" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9" dependencies = [ "itoa", "ryu", @@ -2520,9 +2543,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -2582,9 +2605,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "slotmap" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" dependencies = [ "version_check", ] @@ -2661,9 +2684,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "92d27c2c202598d05175a6dd3af46824b7f747f8d8e9b14c623f19fa5069735d" dependencies = [ "proc-macro2", "quote", @@ -2672,42 +2695,42 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.4.1", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "b2cd5904763bad08ad5513ddbb12cf2ae273ca53fa9f68e843e236ec6dfccc09" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "3dcf4a824cce0aeacd6f38ae6f24234c8e80d68632338ebaa1443b5df9e29e19" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", ] [[package]] name = "time" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" dependencies = [ "deranged", "itoa", @@ -2727,18 +2750,18 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" dependencies = [ "time-core", ] [[package]] name = "tinystr" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219" +checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" dependencies = [ "displaydoc", ] @@ -2835,18 +2858,18 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unic-langid" -version = "0.9.1" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f" +checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516" dependencies = [ "unic-langid-impl", ] [[package]] name = "unic-langid-impl" -version = "0.9.1" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff" +checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6" dependencies = [ "serde", "tinystr", @@ -2854,15 +2877,15 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" [[package]] name = "unicode-bom" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98e90c70c9f0d4d1ee6d0a7d04aa06cb9bbd53d8cfbdd62a0269a7c2eb640552" +checksum = "7eec5d1121208364f6793f7d2e222bf75a915c19557537745b195b253dd64217" [[package]] name = "unicode-ident" @@ -2893,9 +2916,9 @@ checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -2932,9 +2955,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2942,24 +2965,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" dependencies = [ "cfg-if", "js-sys", @@ -2969,9 +2992,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2979,22 +3002,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "wayland-client" @@ -3083,9 +3106,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.65" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" dependencies = [ "js-sys", "wasm-bindgen", @@ -3093,9 +3116,9 @@ dependencies = [ [[package]] name = "web-time" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57099a701fb3a8043f993e8228dc24229c7b942e2b009a1b962e54489ba1d3bf" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" dependencies = [ "js-sys", "wasm-bindgen", @@ -3160,11 +3183,21 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows-targets 0.48.5", + "windows-core", + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", ] [[package]] @@ -3185,6 +3218,15 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -3215,6 +3257,21 @@ dependencies = [ "windows_x86_64_msvc 0.48.5", ] +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -3227,6 +3284,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -3239,6 +3302,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -3251,6 +3320,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -3263,6 +3338,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -3275,6 +3356,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -3287,6 +3374,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -3299,6 +3392,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + [[package]] name = "winit" version = "0.28.7" @@ -3335,9 +3434,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.5.19" +version = "0.5.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +checksum = "97a4882e6b134d6c28953a387571f1acdd3496830d5e36c5e3a1075580ea641c" dependencies = [ "memchr", ] @@ -3355,12 +3454,12 @@ dependencies = [ [[package]] name = "x11rb" -version = "0.10.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507" +checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" dependencies = [ "gethostname", - "nix 0.24.3", + "nix 0.26.4", "winapi", "winapi-wsapoll", "x11rb-protocol", @@ -3368,21 +3467,18 @@ dependencies = [ [[package]] name = "x11rb-protocol" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67" +checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc" dependencies = [ - "nix 0.24.3", + "nix 0.26.4", ] [[package]] name = "xcursor" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" -dependencies = [ - "nom", -] +checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" [[package]] name = "xi-unicode" @@ -3398,20 +3494,20 @@ checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" [[package]] name = "zerocopy" -version = "0.7.25" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.25" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", ] diff --git a/pkgs/tools/system/amdgpu_top/default.nix b/pkgs/tools/system/amdgpu_top/default.nix index 73742692af0c..3b220a919fef 100644 --- a/pkgs/tools/system/amdgpu_top/default.nix +++ b/pkgs/tools/system/amdgpu_top/default.nix @@ -14,18 +14,18 @@ rustPlatform.buildRustPackage rec { pname = "amdgpu_top"; - version = "0.3.1"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Umio-Yasuno"; repo = pname; rev = "v${version}"; - hash = "sha256-bkrXm3lXJr+sZ09GeVHgfIp8JO3a/Ejrsm1Cm4eY4IU="; + hash = "sha256-/8fYoIp0EezqamKYoZYLllKm5BmljJ0iRpaM2uSPw5Q="; }; cargoLock = { outputHashes = { - "libdrm_amdgpu_sys-0.2.2" = "sha256-2QXT/6octEzokW8+0mHx02R8qQ3kCBDxZT4yyfDkM5A="; + "libdrm_amdgpu_sys-0.4.1" = "sha256-4z6f0vQHF2sAbvAoGMTrAzI953bjsA7Kw719HDuhjg4="; }; lockFile = ./Cargo.lock; }; From 3cad2da1f8ab5f1941503b9df8b6da8a52cab0cd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Jan 2024 12:50:42 +0100 Subject: [PATCH 78/95] python311Packages.epion: add changelog to meta --- pkgs/development/python-modules/epion/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/epion/default.nix b/pkgs/development/python-modules/epion/default.nix index 945c65554d3a..69afe290652a 100644 --- a/pkgs/development/python-modules/epion/default.nix +++ b/pkgs/development/python-modules/epion/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to access Epion sensor data"; homepage = "https://github.com/devenzo-com/epion_python"; + changelog = "https://github.com/devenzo-com/epion_python/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From e0fe0f7d52cc52e0fe58c93bb33794b3729f84bb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Jan 2024 12:53:10 +0100 Subject: [PATCH 79/95] python311Packages.fireflyalgorithm: refactor --- .../python-modules/fireflyalgorithm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/fireflyalgorithm/default.nix b/pkgs/development/python-modules/fireflyalgorithm/default.nix index c052cf07c67a..38ddb6772a70 100644 --- a/pkgs/development/python-modules/fireflyalgorithm/default.nix +++ b/pkgs/development/python-modules/fireflyalgorithm/default.nix @@ -8,15 +8,15 @@ }: buildPythonPackage rec { - pname = "FireflyAlgorithm"; + pname = "fireflyalgorithm"; version = "0.4.4"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "firefly-cpp"; - repo = pname; + repo = "FireflyAlgorithm"; rev = "refs/tags/${version}"; hash = "sha256-xsTgSHBtN4gGw+9YvprcLubnCXSNRdn4abcz391cMEE="; }; From e5fb7f2ef9f0c826d53339b602d42a4cc1380c76 Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Sun, 14 Jan 2024 13:36:57 +0100 Subject: [PATCH 80/95] vdirsyncer: fix build by relaxing aiostream vdirsyncer depends on aiostream<5.0, but aiostream 5 didn't introduce any changes which break vdirsyncer as far as I know thus relaxing the dependency fixes the build --- pkgs/development/python-modules/vdirsyncer/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix index 70446323f1d9..b9046f991f6c 100644 --- a/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -22,6 +22,7 @@ , aioresponses , vdirsyncer , testers +, pythonRelaxDepsHook }: buildPythonPackage rec { @@ -44,6 +45,11 @@ buildPythonPackage rec { setuptools setuptools-scm wheel + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "aiostream" ]; propagatedBuildInputs = [ From 02192dde3dbabb645fde26fd358d894fc44ffc9b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jan 2024 12:48:59 +0000 Subject: [PATCH 81/95] python311Packages.gotenberg-client: 0.4.1 -> 0.5.0 --- pkgs/development/python-modules/gotenberg-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gotenberg-client/default.nix b/pkgs/development/python-modules/gotenberg-client/default.nix index d185a8a1aa0c..947936616fd1 100644 --- a/pkgs/development/python-modules/gotenberg-client/default.nix +++ b/pkgs/development/python-modules/gotenberg-client/default.nix @@ -8,7 +8,7 @@ }: buildPythonPackage rec { pname = "gotenberg-client"; - version = "0.4.1"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "stumpylog"; repo = "gotenberg-client"; rev = "refs/tags/${version}"; - hash = "sha256-mjVzwlawJojSHI7SSchUWLS320wXl1eHy7A7/IPU8mk="; + hash = "sha256-38s7XLCh55uXxu/Go04Ku/m4xeqAAa2sRe4SiqIXolU="; }; nativeBuildInputs = [ From eec7a7225e7e66c04a0e53a24d259b27029c85af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jan 2024 12:59:27 +0000 Subject: [PATCH 82/95] python311Packages.grafanalib: 0.7.0 -> 0.7.1 --- pkgs/development/python-modules/grafanalib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/grafanalib/default.nix b/pkgs/development/python-modules/grafanalib/default.nix index 6dcb88a32f3d..aba3fbe4ec95 100644 --- a/pkgs/development/python-modules/grafanalib/default.nix +++ b/pkgs/development/python-modules/grafanalib/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "grafanalib"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "weaveworks"; repo = pname; - rev = "v${version}"; - hash = "sha256-yQIDAQMG84onYWqBxIl5IXSaBlJBO/uUIy4CVvoFyGk="; + rev = "refs/tags/v${version}"; + hash = "sha256-vXnyAfC9avKz8U4+MJVnu2zoPD0nR2qarWYidhEPW5s="; }; nativeBuildInputs = [ From 8b27ff83eca6ee6596cab10f5dc941ba5a6182c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Jan 2024 14:04:45 +0100 Subject: [PATCH 83/95] python311Packages.pydrawise: 2024.1.0 -> 2024.1.1 Diff: https://github.com/dknowles2/pydrawise/compare/refs/tags/2024.1.0...2024.1.1 Changelog: https://github.com/dknowles2/pydrawise/releases/tag/2024.1.1 --- pkgs/development/python-modules/pydrawise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydrawise/default.nix b/pkgs/development/python-modules/pydrawise/default.nix index c7fedf9080b1..adddc92dbc1a 100644 --- a/pkgs/development/python-modules/pydrawise/default.nix +++ b/pkgs/development/python-modules/pydrawise/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pydrawise"; - version = "2024.1.0"; + version = "2024.1.1"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pydrawise"; rev = "refs/tags/${version}"; - hash = "sha256-FbnCo0kdAkm//OHINeEL8ibEH0BxVb9cOypyo54kXY4="; + hash = "sha256-fMwWGE6WfgENti4H+WSfd8ZSHqxHyBVATUhng/o8qeY="; }; nativeBuildInputs = [ From bfb58157d580deeaf69a96a71a4e9ddfdd1b997e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 14 Jan 2024 21:14:36 +0800 Subject: [PATCH 84/95] xed-editor: Fix typelib path We patch gobject-introspection and meson to store absolute paths to libraries in typelibs but that requires the install_dir is an absolute path. ref: https://github.com/NixOS/nixpkgs/commit/1b2a061c87fd079f57a05c5390a42dcc777498f0 --- .../editors/xed-editor/correct-gir-lib-path.patch | 13 +++++++++++++ pkgs/applications/editors/xed-editor/default.nix | 6 ++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/applications/editors/xed-editor/correct-gir-lib-path.patch diff --git a/pkgs/applications/editors/xed-editor/correct-gir-lib-path.patch b/pkgs/applications/editors/xed-editor/correct-gir-lib-path.patch new file mode 100644 index 000000000000..fa530e9a12af --- /dev/null +++ b/pkgs/applications/editors/xed-editor/correct-gir-lib-path.patch @@ -0,0 +1,13 @@ +diff --git a/xed/meson.build b/xed/meson.build +index 7525bad..ae0814e 100644 +--- a/xed/meson.build ++++ b/xed/meson.build +@@ -143,7 +143,7 @@ libxed = library( + dependencies: xed_deps, + include_directories: include_dirs, + install: true, +- install_dir: join_paths(libdir, 'xed') ++ install_dir: join_paths(prefix, libdir, 'xed') + ) + + install_headers( diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix index 164b1fee45de..8ce15bdce09e 100644 --- a/pkgs/applications/editors/xed-editor/default.nix +++ b/pkgs/applications/editors/xed-editor/default.nix @@ -28,6 +28,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-MXRxzmRo/dRhp5Llib9ng1gzWW8uvzqTMjUVK8a3eJ8="; }; + patches = [ + # We patch gobject-introspection and meson to store absolute paths to libraries in typelibs + # but that requires the install_dir is an absolute path. + ./correct-gir-lib-path.patch + ]; + nativeBuildInputs = [ meson pkg-config From 02266dc69eb5aa8f33df6b5ccbde1c128f64001c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20B=C3=BChler?= Date: Sun, 14 Jan 2024 15:14:58 +0100 Subject: [PATCH 85/95] electron: migrate to fixup-yarn-lock from prefetch-yarn-deps (#269933) --- pkgs/development/tools/electron/common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index 9e02460f2774..823b45971139 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -5,7 +5,7 @@ , python3 , fetchYarnDeps , fetchNpmDeps -, fixup_yarn_lock +, prefetch-yarn-deps , npmHooks , yarn , substituteAll @@ -27,7 +27,7 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { inherit (info) version; buildTargets = [ "electron:electron_dist_zip" ]; - nativeBuildInputs = base.nativeBuildInputs ++ [ nodejs yarn fixup_yarn_lock unzip npmHooks.npmConfigHook ]; + nativeBuildInputs = base.nativeBuildInputs ++ [ nodejs yarn prefetch-yarn-deps unzip npmHooks.npmConfigHook ]; buildInputs = base.buildInputs ++ [ libnotify ]; electronOfflineCache = fetchYarnDeps { @@ -107,7 +107,7 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { cd electron export HOME=$TMPDIR/fake_home yarn config --offline set yarn-offline-mirror $electronOfflineCache - fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive ) From a77764f6c1678bc1ae1f607884181d5333f92fb1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jan 2024 14:24:25 +0000 Subject: [PATCH 86/95] python311Packages.hahomematic: 2024.1.6 -> 2024.1.7 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index 364e5a0f40ae..9609365f7fef 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2024.1.6"; + version = "2024.1.7"; pyproject = true; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = "hahomematic"; rev = "refs/tags/${version}"; - hash = "sha256-LE5bdcsEPd40w/qQu4Dwxxn2q3fcC0W+u8Dm00r1P40="; + hash = "sha256-98biJ/BXFZV55FMRvT8QexzWVB2rfF/YVa66+HU06mI="; }; __darwinAllowLocalNetworking = true; From ddbab9f8532be6d2dd415f16482a6839805de6a3 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sun, 14 Jan 2024 09:38:10 -0500 Subject: [PATCH 87/95] folks: Really disable tests --- pkgs/development/libraries/folks/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index a169f01fb543..0cf2e84ac16d 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -25,14 +25,14 @@ # TODO: enable more folks backends -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "folks"; version = "0.15.7"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${finalAttrs.pname}/${lib.versions.majorMinor finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; sha256 = "Eg8hnvYyEsqpWuf2rrZOKZKLCxqLlFIFQwSgDQ80eHE="; }; @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddocs=true" "-Dtelepathy_backend=${lib.boolToString telepathySupport}" - "-Dtests=${lib.boolToString stdenv.isLinux}" + "-Dtests=${lib.boolToString (finalAttrs.doCheck && stdenv.isLinux)}" ]; # backends/eds/lib/libfolks-eds.so.26.0.0.p/edsf-persona-store.c:10697:4: @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = finalAttrs.pname; versionPolicy = "none"; }; }; @@ -115,4 +115,4 @@ stdenv.mkDerivation rec { maintainers = teams.gnome.members; platforms = platforms.unix; }; -} +}) From 03f54507fa6550f615f1c0219e6b0577584afda4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 14 Jan 2024 15:43:30 +0100 Subject: [PATCH 88/95] home-assistant-custom-lovelace-modules.mushroom: 3.2.3 -> 3.2.4 https://github.com/piitaya/lovelace-mushroom/releases/tag/v3.2.4 --- .../custom-lovelace-modules/mushroom/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix index 2f114c595192..6e8eab20b359 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "mushroom"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "piitaya"; repo = "lovelace-mushroom"; rev = "v${version}"; - hash = "sha256-JGpMcIO8zTjcTqjKWxmVHnshIvBeCy/6UmMT+qTHla4="; + hash = "sha256-UV/kqeVslB1lc1a9uvj8ocQKeAVINwo3aH8oHC9GLBQ="; }; - npmDepsHash = "sha256-0vSTpCG8AbDaiHW5d5nUgcrfPMt85JHX4KKoWTOgr4g="; + npmDepsHash = "sha256-p43ks6HM23LK3LOBOZA0uV+DTOj89/boBpjcXpbcw24="; installPhase = '' runHook preInstall From d4207e550aa35d2f88fb8b0667afd3e96b75de5e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 14 Jan 2024 23:22:35 +0800 Subject: [PATCH 89/95] folks: Replace finalAttrs.pname with fixed string folks https://github.com/NixOS/nixpkgs/issues/277994 --- pkgs/development/libraries/folks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 0cf2e84ac16d..c100a8862d5c 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${finalAttrs.pname}/${lib.versions.majorMinor finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; + url = "mirror://gnome/sources/folks/${lib.versions.majorMinor finalAttrs.version}/folks-${finalAttrs.version}.tar.xz"; sha256 = "Eg8hnvYyEsqpWuf2rrZOKZKLCxqLlFIFQwSgDQ80eHE="; }; @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gnome.updateScript { - packageName = finalAttrs.pname; + packageName = "folks"; versionPolicy = "none"; }; }; From a005b43238f591552880a385e07a62d3e8382e78 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 14 Jan 2024 10:45:27 -0500 Subject: [PATCH 90/95] nushellPlugins: hash update for 0.89.0 --- pkgs/shells/nushell/plugins/formats.nix | 2 +- pkgs/shells/nushell/plugins/gstat.nix | 2 +- pkgs/shells/nushell/plugins/query.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index 571077a8d23b..75927a606ef9 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; inherit (nushell) version src; - cargoHash = "sha256-eGRaYbYB+zHT8rXm6aCrnPVgyDA8ltsg0GOYgghmov0="; + cargoHash = "sha256-81U7Ul6LPubTshxW2/c+Pmz8UolmM42sFEt2igmDgGY="; env = lib.optionalAttrs stdenv.cc.isClang { LIBCLANG_PATH = "${libclang.lib}/lib"; diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index 378a1a273ca8..1957799a9ce4 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; inherit (nushell) version src; - cargoHash = "sha256-Ar5rFPHf+ugZuugVKVRFACYhh3F0JvQtfp6KibPIByw="; + cargoHash = "sha256-YUr//URKoN99Pc5tJx9eGopKqy4Yu83jPBhLu5UYgiY="; env = lib.optionalAttrs stdenv.cc.isClang { LIBCLANG_PATH = "${libclang.lib}/lib"; diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index f5f0bbd0acca..c65f6544a235 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; inherit (nushell) version src; - cargoHash = "sha256-NVdXbpmGBAcv47jbel2cccoe0m2FInSSOnMWofqtpiM="; + cargoHash = "sha256-IAMfd76+Sx01d4axn3qcLvXZW6nxu0fjy9CvupUTHBM="; env = lib.optionalAttrs stdenv.cc.isClang { LIBCLANG_PATH = "${libclang.lib}/lib"; From 058c8b442fa76107ab59305a741d62335ba9e524 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jan 2024 15:49:36 +0000 Subject: [PATCH 91/95] python311Packages.idasen: 0.11.0 -> 0.11.1 --- pkgs/development/python-modules/idasen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/idasen/default.nix b/pkgs/development/python-modules/idasen/default.nix index 3f28e9a6774a..5fee7d5c9f0d 100644 --- a/pkgs/development/python-modules/idasen/default.nix +++ b/pkgs/development/python-modules/idasen/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "idasen"; - version = "0.11.0"; + version = "0.11.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "newAM"; repo = "idasen"; rev = "refs/tags/v${version}"; - hash = "sha256-ybM3dQhTogjhtIO5daWMXpnxUM7uWYnKONMOEx3u+58="; + hash = "sha256-nduag5ubgwhOcprdZppLIPQPDE06dk9OzniIIJpM12s="; }; nativeBuildInputs = [ From 32c72f2cf09b31ae75696f0eb3ea82cfdadcc0bc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Jan 2024 17:27:53 +0100 Subject: [PATCH 92/95] python311Packages.soco: 0.30.1 -> 0.30.2 Diff: https://github.com/SoCo/SoCo/compare/refs/tags/v0.30.1...v0.30.2 Changelog: https://github.com/SoCo/SoCo/releases/tag/v0.30.2 --- pkgs/development/python-modules/soco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index 40bcd475604e..41774ec79ee1 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "soco"; - version = "0.30.1"; + version = "0.30.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "SoCo"; repo = "SoCo"; rev = "refs/tags/v${version}"; - hash = "sha256-MajtB754VY+WmeJ2UROeNfvFdqSWIDXQwDSDK7zn8fk="; + hash = "sha256-T5kZxwLtqdECuYNfI0z2kLuTPp8yuPsx+MQG27WUJYU="; }; propagatedBuildInputs = [ From c09acaa9056975a9a5b52be1703e543151283a91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 18 Jun 2023 22:55:24 +0200 Subject: [PATCH 93/95] nixos/pcscd: cleanup code --- nixos/modules/services/hardware/pcscd.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nixos/modules/services/hardware/pcscd.nix b/nixos/modules/services/hardware/pcscd.nix index a9e4998efe37..0935f966110a 100644 --- a/nixos/modules/services/hardware/pcscd.nix +++ b/nixos/modules/services/hardware/pcscd.nix @@ -16,9 +16,6 @@ let in { - - ###### interface - options.services.pcscd = { enable = mkEnableOption (lib.mdDoc "PCSC-Lite daemon"); @@ -46,10 +43,7 @@ in }; }; - ###### implementation - config = mkIf config.services.pcscd.enable { - environment.etc."reader.conf".source = cfgFile; environment.systemPackages = [ package ]; From 6ecb73df1b45a5195167512e57b6bd915208b87e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 18 Jun 2023 22:55:44 +0200 Subject: [PATCH 94/95] nixos/pcscd: suggest yubikey-personalization for additional udev rules --- nixos/modules/services/hardware/pcscd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/pcscd.nix b/nixos/modules/services/hardware/pcscd.nix index 0935f966110a..0d4cfc4879c8 100644 --- a/nixos/modules/services/hardware/pcscd.nix +++ b/nixos/modules/services/hardware/pcscd.nix @@ -22,7 +22,7 @@ in plugins = mkOption { type = types.listOf types.package; defaultText = literalExpression "[ pkgs.ccid ]"; - example = literalExpression "[ pkgs.pcsc-cyberjack ]"; + example = literalExpression "with pkgs; [ pcsc-cyberjack yubikey-personalization ]"; description = lib.mdDoc "Plugin packages to be used for PCSC-Lite."; }; From 74808f169cf137a632593524672f68dd834251ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 18 Jun 2023 22:56:07 +0200 Subject: [PATCH 95/95] nixos/pcscd: remove noop restartTriggers --- nixos/modules/services/hardware/pcscd.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/hardware/pcscd.nix b/nixos/modules/services/hardware/pcscd.nix index 0d4cfc4879c8..58b94dae5734 100644 --- a/nixos/modules/services/hardware/pcscd.nix +++ b/nixos/modules/services/hardware/pcscd.nix @@ -55,7 +55,6 @@ in systemd.services.pcscd = { environment.PCSCLITE_HP_DROPDIR = pluginEnv; - restartTriggers = [ "/etc/reader.conf" ]; # If the cfgFile is empty and not specified (in which case the default # /etc/reader.conf is assumed), pcscd will happily start going through the