From 6d6ab741997f79bad92fe383ce4bfb31cdab3707 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 17 Apr 2024 16:04:14 +0200 Subject: [PATCH 01/73] lomiri.lomiri-ui-toolkit: 1.3.5012 -> 1.3.5100 --- .../2001-Mark-problematic-tests.patch | 25 ++++++------ .../lomiri/qml/lomiri-ui-toolkit/default.nix | 38 ++++++------------- 2 files changed, 22 insertions(+), 41 deletions(-) diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch index 1eac4fde58b4..dc1d1e2083c0 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch +++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch @@ -1,20 +1,18 @@ -From 243477a2bd6e315c77ebaf5b2ed4a9c9c4e1e22a Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Sat, 25 Nov 2023 10:49:32 +0100 +From c71d5fed4ef1f0b6d56400cddf02d8ac438168c8 Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Wed, 17 Apr 2024 16:18:23 +0200 Subject: [PATCH] Mark problematic tests - ShapeMaterial requires a Qt OpenGL context, doesn't work in our sandbox - SignalSpy on QML shaders compilers don't see changes -- Scaling value from environment not picked up properly since Qt 5.15.11 - https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/issues/34 - TypeError on some properties with Qt 5.15 https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/issues/9 --- - tests/checkresults.sh | 89 ++++++++++++++++++++++++++++++++++++++++--- - 1 file changed, 83 insertions(+), 6 deletions(-) + tests/checkresults.sh | 88 ++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 82 insertions(+), 6 deletions(-) diff --git a/tests/checkresults.sh b/tests/checkresults.sh -index fc498985e..730b9d406 100755 +index fc498985e..b5d204d0d 100755 --- a/tests/checkresults.sh +++ b/tests/checkresults.sh @@ -22,6 +22,7 @@ ERRORS_PATTERN=' Date: Wed, 17 Apr 2024 16:05:28 +0200 Subject: [PATCH 02/73] ayatana-indicator-datetime: 23.10.1 -> 24.2.0 --- .../ay/ayatana-indicator-datetime/package.nix | 31 ++++--------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix index 9b8419df8905..7888fc3b9ffe 100644 --- a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , gitUpdater , nixosTests , ayatana-indicator-messages @@ -32,38 +31,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ayatana-indicator-datetime"; - version = "23.10.1"; + version = "24.2.0"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-indicator-datetime"; rev = finalAttrs.version; - hash = "sha256-cm1zhG9TODGe79n/fGuyVnWL/sjxUc3ZCu9FhqA1NLE="; + hash = "sha256-J3Yp7Dx4UvvdlM8Cp1sPe4Ftm/aAmNzpo4re/jF7pRo="; }; - patches = [ - # Fix test-menus building & running - # Remove when version > 23.10.1 - (fetchpatch { - name = "0001-ayatana-indicator-datetime-Fix-test-menus-tests.patch"; - url = "https://github.com/AyatanaIndicators/ayatana-indicator-datetime/commit/ddabb4a61a496da14603573b700c5961a3e5b834.patch"; - hash = "sha256-vf8aVXonCoTWMuAQZG6FuklWR2IaGY4hecFtoyNCGg8="; - }) - - # Fix EDS-related tests - # Remove when version > 23.10.1 - (fetchpatch { - name = "0002-ayatana-indicator-datetime-Fix-EDS-colour-tests.patch"; - url = "https://github.com/AyatanaIndicators/ayatana-indicator-datetime/commit/6d67f7b458911833e72e0b4a162b1d823609d6f8.patch"; - hash = "sha256-VUdMJuma6rmsjUOeyO0W8UNKADODiM+wDVfj6aDhqgw="; - }) - ]; - postPatch = '' - # Queries systemd user unit dir via pkg_get_variable, can't override prefix + # Override systemd prefix substituteInPlace data/CMakeLists.txt \ - --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'set(SYSTEMD_USER_DIR ''${CMAKE_INSTALL_PREFIX}/lib/systemd/user)' \ - --replace-fail '/etc' "\''${CMAKE_INSTALL_FULL_SYSCONFDIR}" + --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' \ + --replace-fail 'XDG_AUTOSTART_DIR "/etc' 'XDG_AUTOSTART_DIR "''${CMAKE_INSTALL_FULL_SYSCONFDIR}' # Looking for Lomiri schemas for code generation substituteInPlace src/CMakeLists.txt \ @@ -136,8 +117,8 @@ stdenv.mkDerivation (finalAttrs: { ]} ''; + # schema is already added automatically by wrapper, EDS needs to be added explicitly preFixup = '' - # schema is already added automatically by wrapper, EDS needs to be added explicitly gappsWrapperArgs+=( --prefix XDG_DATA_DIRS : "${edsDataDir}" ) From d0805fa861d589dcaf9127961a937dc8d6a544b4 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 17 Apr 2024 16:06:26 +0200 Subject: [PATCH 03/73] lomiri.lomiri-system-settings-unwrapped: 1.0.2 -> 1.1.0 --- .../lomiri-system-settings/default.nix | 36 ++++--------------- 1 file changed, 7 insertions(+), 29 deletions(-) diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix index a4050e596d09..5230e8541181 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix @@ -44,13 +44,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-system-settings-unwrapped"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-system-settings"; rev = finalAttrs.version; - hash = "sha256-gi6ZujIs0AEDLsqcTNlRNSS8SyqEU6q0+xaDf55XwuM="; + hash = "sha256-Po5eArO7zyaGatTf6kqci3DdzFDJSZakeglbiMx9kR8="; }; outputs = [ @@ -73,34 +73,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-lSKAhtE3oSSv7USvDbbcfBZWAtWMmuKneWawKQABIiM="; }) - # Remove when version > 1.0.2 + # Fixes tests with very-recent python-dbusmock + # Remove when version > 1.1.0 (fetchpatch { - name = "0003-lomiri-system-settings-Use-GSettings-for-DT2W-value.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/29e2533efcac23e41b083b11c540c9221b71de7e.patch"; - hash = "sha256-d52d/b1ZdafaqhOljCg5E3I12XWtFAfG4rmn8CYngB4="; - }) - ] ++ lib.optionals (lib.strings.versionOlder python3.pkgs.python-dbusmock.version "0.30.1") [ - # Makes tests work with newer dbusmock, but breaks with much-newer dbusmock - # See for details: - # - https://gitlab.com/ubports/development/core/lomiri-system-settings/-/merge_requests/354 - # - https://gitlab.com/ubports/development/core/lomiri-system-settings/-/merge_requests/426 - # Remove/adjust based on merges & next LSS release, and packaged version of dbusmock - (fetchpatch { - name = "0101-lomiri-system-settings-Pass-missing-parameters-to-dbusmock.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/b9aacd88e3789dbb7578f32b31ad5b239db227a2.patch"; - hash = "sha256-jf+jMc+6QxONavlX5C9UZyX23jb6fZnYV8mWFyQGGbU="; - }) - (fetchpatch { - name = "0102-lomiri-system-settings-Fix-BT-plugin-testIsPaired.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/e39b9728e18635413f07f9c9f6ddc73208260b2a.patch"; - hash = "sha256-YUtdlQ2XcanXzsxD40SbML7fSxG75yMKz/XnaQN9YP8="; - }) - (fetchpatch { - name = "0103-lomiri-system-settings-Fix-BT-plugin-testGet-IconName-Type.patch"; - url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/9ad5d9324945f06f764d3a963dbfc7bccefe574b.patch"; - # Merge conflict, relevant change handled further down - excludes = [ "CMakeLists.txt" ]; - hash = "sha256-QCgkVos9Q9/8jd25rqzdEKdnBw0Re47X7B9nLH8QOQU="; + name = "0003-lomiri-system-settings-Revert-Pass-missing-parameter-to-dbusmock-bluez-PairDevice-function.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/67d9e28ebab8bdb9473d5bf8da2b7573e6848fa2.patch"; + hash = "sha256-pFWNne2UH3R5Fz9ayHvIpDXDQbXPs0k4b/oRg0fzi+s="; }) ] ++ [ From 489c3d29dfd2f36bfa835a8699ad138c2dc72ab8 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Tue, 26 Mar 2024 15:21:58 +0900 Subject: [PATCH 04/73] talosctl: 1.6.5 -> 1.7.0 --- pkgs/applications/networking/cluster/talosctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 3651d4652fc7..5a46b80749b0 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.6.5"; + version = "1.7.0"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - hash = "sha256-TEQnbQux+rN2WdlIbxh836Lx/ipqTDkoUsjQP8Ubl6s="; + hash = "sha256-E5pu37R2y0hQezM/p6LJXZv2L6QnV89Ir2HoKaqcOqI="; }; - vendorHash = "sha256-xdcHd/LvIm4rawwXtsGMF8Es9pMGMaJJaZ6UQwc24ZU="; + vendorHash = "sha256-5vWAZsLQxPZGpTiT/OowCLNPdE5e+HrAGXpFRw6jgbU="; ldflags = [ "-s" "-w" ]; From 72ed33777c6b6bc797b2b3e11ea127424dd95693 Mon Sep 17 00:00:00 2001 From: Hans Christian Schmitz Date: Wed, 28 Feb 2024 17:23:33 +0100 Subject: [PATCH 05/73] nixos/wireplumber: add `extraConfig`/`extraScripts` options Follow-up to #282377. #282377 broke `environment.etc."wireplumber<...>"`, however WirePlumber did not yet have `extraConfig` style options for configuring it ergonomically outside of `environment.etc`. This has caused issues for people who had custom config files for WirePlumber, as having to create a config package just to edit some settings is not as ergonomic or discoverable as with a proper `extraConfig` style option. This commit fixes this issue by adding the `extraConfig` option for additional config file and the `extraScripts` option for additional scripts to be used by config files. With WirePlumber 0.5 it is possible to supply config files and scripts via the `XDG_DATA_DIRS` variable to the WirePlumber daemon. This is how the new options and with this change also the `configPackages` option expose their files to the daemon. This way `environment.etc."wireplumber"` works again for user configuration and breakage of old configs from 23.11 to 24.05 should be limited to those caused by the change in the config format from WirePlumber 0.4 to 0.5. --- .../desktops/pipewire/wireplumber.nix | 183 +++++++++++++++--- 1 file changed, 159 insertions(+), 24 deletions(-) diff --git a/nixos/modules/services/desktops/pipewire/wireplumber.nix b/nixos/modules/services/desktops/pipewire/wireplumber.nix index 6ab62eb03c25..c924801bcd8b 100644 --- a/nixos/modules/services/desktops/pipewire/wireplumber.nix +++ b/nixos/modules/services/desktops/pipewire/wireplumber.nix @@ -1,18 +1,40 @@ { config, lib, pkgs, ... }: let - inherit (builtins) attrNames concatMap length; + inherit (builtins) concatMap; inherit (lib) maintainers; - inherit (lib.attrsets) attrByPath filterAttrs; + inherit (lib.attrsets) attrByPath mapAttrsToList; inherit (lib.lists) flatten optional; inherit (lib.modules) mkIf; inherit (lib.options) literalExpression mkOption; - inherit (lib.strings) hasPrefix; - inherit (lib.types) bool listOf package; + inherit (lib.strings) concatStringsSep makeSearchPath; + inherit (lib.types) bool listOf attrsOf package lines; + inherit (lib.path) subpath; pwCfg = config.services.pipewire; cfg = pwCfg.wireplumber; pwUsedForAudio = pwCfg.audio.enable; + + json = pkgs.formats.json { }; + + configSectionsToConfFile = path: value: + pkgs.writeTextDir + path + (concatStringsSep "\n" ( + mapAttrsToList + (section: content: "${section} = " + (builtins.toJSON content)) + value + )); + + mapConfigToFiles = config: + mapAttrsToList + (name: value: configSectionsToConfFile "share/wireplumber/wireplumber.conf.d/${name}.conf" value) + config; + + mapScriptsToFiles = scripts: + mapAttrsToList + (relativePath: value: pkgs.writeTextDir (subpath.join ["share/wireplumber/scripts" relativePath]) value) + scripts; in { meta.maintainers = [ maintainers.k900 ]; @@ -33,6 +55,114 @@ in description = "The WirePlumber derivation to use."; }; + extraConfig = mkOption { + # Two layer attrset is necessary before using JSON, because of the whole + # config file not being a JSON object, but a concatenation of JSON objects + # in sections. + type = attrsOf (attrsOf json.type); + default = { }; + example = literalExpression ''{ + "log-level-debug" = { + "context.properties" = { + # Output Debug log messages as opposed to only the default level (Notice) + "log.level" = "D"; + }; + }; + "wh-1000xm3-ldac-hq" = { + "monitor.bluez.rules" = [ + { + matches = [ + { + # Match any bluetooth device with ids equal to that of a WH-1000XM3 + "device.name" = "~bluez_card.*"; + "device.product.id" = "0x0cd3"; + "device.vendor.id" = "usb:054c"; + } + ]; + actions = { + update-props = { + # Set quality to high quality instead of the default of auto + "bluez5.a2dp.ldac.quality" = "hq"; + }; + }; + } + ]; + }; + }''; + description = '' + Additional configuration for the WirePlumber daemon when run in + single-instance mode (the default in nixpkgs and currently the only + supported way to run WirePlumber configured via `extraConfig`). + + See also: + - [The configuration file][docs-the-conf-file] + - [Modifying configuration][docs-modifying-config] + - [Locations of files][docs-file-locations] + - and the [configuration section][docs-config-section] of the docs in general + + Note that WirePlumber (and PipeWire) use dotted attribute names like + `device.product.id`. These are not nested, but flat objects for WirePlumber/PipeWire, + so to write these in nix expressions, remember to quote them like `"device.product.id"`. + Have a look at the example for this. + + [docs-the-conf-file]: https://pipewire.pages.freedesktop.org/wireplumber/daemon/configuration/conf_file.html + [docs-modifying-config]: https://pipewire.pages.freedesktop.org/wireplumber/daemon/configuration/modifying_configuration.html + [docs-file-locations]: https://pipewire.pages.freedesktop.org/wireplumber/daemon/configuration/locations.html + [docs-config-section]: https://pipewire.pages.freedesktop.org/wireplumber/daemon/configuration.html + ''; + }; + + extraScripts = mkOption { + type = attrsOf lines; + default = { }; + example = { + "test/hello-world.lua" = '' + print("Hello, world!") + ''; + }; + description = '' + Additional scripts for WirePlumber to be used by configuration files. + + Every item in this attrset becomes a separate lua file with the path + relative to the `scripts` directory specified in the name of the item. + The scripts get passed to the WirePlumber service via the `XDG_DATA_DIRS` + variable. Scripts specified here are preferred over those shipped with + WirePlumber if they occupy the same relative path. + + For a script to be loaded, it needs to be specified as part of a component, + and that component needs to be required by an active profile (e.g. `main`). + Components can be defined in config files either via `extraConfig` or `configPackages`. + + For the hello-world example, you'd have to add the following `extraConfig`: + ```nix + services.pipewire.wireplumber.extraConfig."99-hello-world" = { + "wireplumber.components" = [ + { + name = "test/hello-world.lua"; + type = "script/lua"; + provides = "custom.hello-world"; + } + ]; + + "wireplumber.profiles" = { + main = { + "custom.hello-world" = "required"; + }; + }; + }; + ``` + + See also: + - [Location of scripts][docs-file-locations-scripts] + - [Components & Profiles][docs-components-profiles] + - [Migration - Loading custom scripts][docs-migration-loading-custom-scripts] + + [docs-file-locations-scripts]: https://pipewire.pages.freedesktop.org/wireplumber/daemon/locations.html#location-of-scripts + [docs-components-profiles]: https://pipewire.pages.freedesktop.org/wireplumber/daemon/configuration/components_and_profiles.html + [docs-migration-loading-custom-scripts]: https://pipewire.pages.freedesktop.org/wireplumber/daemon/configuration/migration.html#loading-custom-scripts + ''; + }; + configPackages = mkOption { type = listOf package; default = [ ]; @@ -57,7 +187,7 @@ in extraLv2Packages = mkOption { type = listOf package; - default = []; + default = [ ]; example = literalExpression "[ pkgs.lsp-plugins ]"; description = '' List of packages that provide LV2 plugins in `lib/lv2` that should @@ -96,9 +226,22 @@ in } ''; + extraConfigPkg = pkgs.buildEnv { + name = "wireplumber-extra-config"; + paths = mapConfigToFiles cfg.extraConfig; + pathsToLink = [ "/share/wireplumber/wireplumber.conf.d" ]; + }; + + extraScriptsPkg = pkgs.buildEnv { + name = "wireplumber-extra-scrips"; + paths = mapScriptsToFiles cfg.extraScripts; + pathsToLink = [ "/share/wireplumber/scripts" ]; + }; + configPackages = cfg.configPackages - ++ optional (!pwUsedForAudio) pwNotForAudioConfigPkg - ++ optional pwCfg.systemWide systemwideConfigPkg; + ++ [ extraConfigPkg extraScriptsPkg ] + ++ optional (!pwUsedForAudio) pwNotForAudioConfigPkg + ++ optional pwCfg.systemWide systemwideConfigPkg; configs = pkgs.buildEnv { name = "wireplumber-configs"; @@ -110,7 +253,7 @@ in ( concatMap (p: - attrByPath ["passthru" "requiredLv2Packages"] [] p + attrByPath [ "passthru" "requiredLv2Packages" ] [ ] p ) configPackages ); @@ -127,24 +270,10 @@ in assertion = !config.hardware.bluetooth.hsphfpd.enable; message = "Using WirePlumber conflicts with hsphfpd, as it provides the same functionality. `hardware.bluetooth.hsphfpd.enable` needs be set to false"; } - { - assertion = length - (attrNames - ( - filterAttrs - (name: value: - hasPrefix "wireplumber/" name || name == "wireplumber" - ) - config.environment.etc - )) == 1; - message = "Using `environment.etc.\"wireplumber<...>\"` directly is no longer supported in 24.05. Use `services.pipewire.wireplumber.configPackages` instead."; - } ]; environment.systemPackages = [ cfg.package ]; - environment.etc.wireplumber.source = "${configs}/share/wireplumber"; - systemd.packages = [ cfg.package ]; systemd.services.wireplumber.enable = pwCfg.systemWide; @@ -156,10 +285,16 @@ in systemd.services.wireplumber.environment = mkIf pwCfg.systemWide { # Force WirePlumber to use system dbus. DBUS_SESSION_BUS_ADDRESS = "unix:path=/run/dbus/system_bus_socket"; + + # Make WirePlumber find our config/script files and lv2 plugins required by those + # (but also the configs/scripts shipped with WirePlumber) + XDG_DATA_DIRS = makeSearchPath "share" [ configs cfg.package ]; LV2_PATH = "${lv2Plugins}/lib/lv2"; }; - systemd.user.services.wireplumber.environment.LV2_PATH = - mkIf (!pwCfg.systemWide) "${lv2Plugins}/lib/lv2"; + systemd.user.services.wireplumber.environment = mkIf (!pwCfg.systemWide) { + XDG_DATA_DIRS = makeSearchPath "share" [ configs cfg.package ]; + LV2_PATH = "${lv2Plugins}/lib/lv2"; + }; }; } From a4a18f7b9263b56e3b7f7af51efc7a7585058ade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 23 Apr 2024 19:49:23 +0200 Subject: [PATCH 06/73] nixos/systemd-boot: avoid expensive mypy builds on configuration changes * Mypy dependencies pull in quite a few packages, which makes it harder to create offline installers. --- .../boot/loader/systemd-boot/systemd-boot.nix | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index 8b218cf1a6b2..02540c362d31 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -7,8 +7,20 @@ let efi = config.boot.loader.efi; + # We check the source code in a derivation that does not depend on the + # system configuration so that most users don't have to redo the check and require + # the necessary dependencies. + checkedSource = pkgs.runCommand "systemd-boot" { } '' + install -m755 -D ${./systemd-boot-builder.py} $out + ${lib.getExe pkgs.buildPackages.mypy} \ + --no-implicit-optional \ + --disallow-untyped-calls \ + --disallow-untyped-defs \ + $out + ''; + systemdBootBuilder = pkgs.substituteAll rec { - src = ./systemd-boot-builder.py; + src = checkedSource; isExecutable = true; @@ -66,19 +78,9 @@ let ''; }; - checkedSystemdBootBuilder = pkgs.runCommand "systemd-boot" { } '' - mkdir -p $out/bin - install -m755 ${systemdBootBuilder} $out/bin/systemd-boot-builder - ${lib.getExe pkgs.buildPackages.mypy} \ - --no-implicit-optional \ - --disallow-untyped-calls \ - --disallow-untyped-defs \ - $out/bin/systemd-boot-builder - ''; - finalSystemdBootBuilder = pkgs.writeScript "install-systemd-boot.sh" '' #!${pkgs.runtimeShell} - ${checkedSystemdBootBuilder}/bin/systemd-boot-builder "$@" + ${systemdBootBuilder} "$@" ${cfg.extraInstallCommands} ''; in { From 7e72dde7e2122b0d29899b569b011ee90c0f5f56 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 24 Apr 2024 21:06:49 +0200 Subject: [PATCH 07/73] rye: 0.31.0 -> 0.33.0 Diff: https://github.com/mitsuhiko/rye/compare/refs/tags/0.31.0...0.33.0 Changelog: https://github.com/mitsuhiko/rye/releases/tag/0.33.0 --- pkgs/development/tools/rye/Cargo.lock | 384 +++++++------------------ pkgs/development/tools/rye/default.nix | 6 +- 2 files changed, 106 insertions(+), 284 deletions(-) diff --git a/pkgs/development/tools/rye/Cargo.lock b/pkgs/development/tools/rye/Cargo.lock index 4fa64e779282..9e24440fb037 100644 --- a/pkgs/development/tools/rye/Cargo.lock +++ b/pkgs/development/tools/rye/Cargo.lock @@ -29,24 +29,22 @@ dependencies = [ [[package]] name = "age" -version = "0.9.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d55a4d912c80a92762ffd1c884065f3f9646467d22c95390e824a0ff7def472" +checksum = "edeef7d7b199195a2d7d7a8155d2d04aee736e60c5c7bdd7097d115369a8817d" dependencies = [ "age-core", - "base64 0.13.1", + "base64 0.21.7", "bech32", "chacha20poly1305", "cookie-factory", - "hkdf", "hmac", "i18n-embed", "i18n-embed-fl", "lazy_static", "nom", "pin-project", - "rand 0.7.3", - "rand 0.8.5", + "rand", "rust-embed", "scrypt", "sha2", @@ -57,17 +55,17 @@ dependencies = [ [[package]] name = "age-core" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d2e815ac879dc23c1139e720d21c6cd4d1276345c772587285d965a69b8f32" +checksum = "a5f11899bc2bbddd135edbc30c36b1924fa59d0746bb45beb5933fafe3fe509b" dependencies = [ - "base64 0.13.1", + "base64 0.21.7", "chacha20poly1305", "cookie-factory", "hkdf", "io_tee", "nom", - "rand 0.8.5", + "rand", "secrecy", "sha2", ] @@ -233,17 +231,6 @@ dependencies = [ "libc", ] -[[package]] -name = "cfb" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" -dependencies = [ - "byteorder", - "fnv", - "uuid", -] - [[package]] name = "cfg-if" version = "1.0.0" @@ -378,12 +365,6 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b" -[[package]] -name = "core-foundation-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - [[package]] name = "cpufeatures" version = "0.2.12" @@ -460,50 +441,29 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "3.2.0" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "fiat-crypto", + "platforms", + "rustc_version", "subtle", "zeroize", ] [[package]] -name = "darling" -version = "0.14.4" +name = "curve25519-dalek-derive" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" -dependencies = [ - "fnv", - "ident_case", "proc-macro2", "quote", - "strsim", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" -dependencies = [ - "darling_core", - "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] @@ -525,22 +485,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" -[[package]] -name = "decompress" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67605f4868a37e8a9c50003a866a6896104602d5d7ddf7e8a7f398ec97e44ab3" -dependencies = [ - "derive_builder", - "flate2", - "infer", - "lazy_static", - "regex", - "tar", - "thiserror", - "zstd 0.12.4", -] - [[package]] name = "deranged" version = "0.3.11" @@ -550,37 +494,6 @@ dependencies = [ "powerfmt", ] -[[package]] -name = "derive_builder" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "derive_builder_macro" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" -dependencies = [ - "derive_builder_core", - "syn 1.0.109", -] - [[package]] name = "deunicode" version = "1.4.2" @@ -599,15 +512,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - [[package]] name = "digest" version = "0.10.7" @@ -688,6 +592,12 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +[[package]] +name = "fiat-crypto" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f" + [[package]] name = "filetime" version = "0.2.23" @@ -763,12 +673,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - [[package]] name = "form_urlencoded" version = "1.2.1" @@ -817,17 +721,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.12" @@ -836,7 +729,7 @@ checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -917,7 +810,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.7", + "digest", ] [[package]] @@ -945,9 +838,9 @@ dependencies = [ [[package]] name = "i18n-embed" -version = "0.13.9" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92a86226a7a16632de6723449ee5fe70bac5af718bc642ee9ca2f0f6e14fa1fa" +checksum = "94205d95764f5bb9db9ea98fa77f89653365ca748e27161f5bbea2ffd50e459c" dependencies = [ "arc-swap", "fluent", @@ -966,9 +859,9 @@ dependencies = [ [[package]] name = "i18n-embed-fl" -version = "0.6.7" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26a3d3569737dfaac7fc1c4078e6af07471c3060b8e570bcd83cdd5f4685395" +checksum = "9fc1f8715195dffc4caddcf1cf3128da15fe5d8a137606ea8856c9300047d5a2" dependencies = [ "dashmap", "find-crate", @@ -998,12 +891,6 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - [[package]] name = "idna" version = "0.5.0" @@ -1037,15 +924,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "infer" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3" -dependencies = [ - "cfb", -] - [[package]] name = "inout" version = "0.1.3" @@ -1266,7 +1144,7 @@ dependencies = [ "tracing", "unscanny", "ureq", - "zstd 0.13.0", + "zstd", ] [[package]] @@ -1290,15 +1168,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi", -] - [[package]] name = "num-conv" version = "0.1.0" @@ -1391,11 +1260,12 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "pbkdf2" -version = "0.11.0" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ - "digest 0.10.7", + "digest", + "hmac", ] [[package]] @@ -1464,6 +1334,12 @@ version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" +[[package]] +name = "platforms" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" + [[package]] name = "poly1305" version = "0.8.0" @@ -1572,19 +1448,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -1592,18 +1455,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -1613,16 +1466,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -1631,16 +1475,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.12", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -1711,7 +1546,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", - "getrandom 0.2.12", + "getrandom", "libc", "spin", "untrusted", @@ -1720,9 +1555,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "6.8.1" +version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661" +checksum = "fb78f46d0066053d16d4ca7b898e9343bc3530f71c61d5ad84cd404ada068745" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -1731,9 +1566,9 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "6.8.1" +version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac" +checksum = "b91ac2a3c6c0520a3fb3dd89321177c3c692937c4eb21893378219da10c44fc8" dependencies = [ "proc-macro2", "quote", @@ -1744,9 +1579,9 @@ dependencies = [ [[package]] name = "rust-embed-utils" -version = "7.8.1" +version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74" +checksum = "86f69089032567ffff4eada41c573fc43ff466c7db7c5688b2e7969584345581" dependencies = [ "sha2", "walkdir", @@ -1764,6 +1599,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + [[package]] name = "rustix" version = "0.38.31" @@ -1801,7 +1645,7 @@ dependencies = [ [[package]] name = "rye" -version = "0.31.0" +version = "0.33.0" dependencies = [ "age", "anyhow", @@ -1812,7 +1656,6 @@ dependencies = [ "console", "ctrlc", "curl", - "decompress", "dialoguer", "dotenvy", "flate2", @@ -1826,10 +1669,8 @@ dependencies = [ "insta-cmd", "junction", "license", - "memchr", "minijinja", "monotrail-utils", - "nix", "once_cell", "pathdiff", "pep440_rs", @@ -1844,10 +1685,9 @@ dependencies = [ "shlex", "slug", "static_vcruntime", - "sysinfo", "tar", "tempfile", - "toml_edit", + "toml_edit 0.22.9", "url", "walkdir", "which", @@ -1855,7 +1695,7 @@ dependencies = [ "winreg", "xattr", "zip", - "zstd 0.13.0", + "zstd", ] [[package]] @@ -1899,11 +1739,10 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scrypt" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f9e24d2b632954ded8ab2ef9fea0a0c769ea56ea98bddbafbad22caeeadf45d" +checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" dependencies = [ - "hmac", "pbkdf2", "salsa20", "sha2", @@ -1954,6 +1793,12 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" +[[package]] +name = "semver" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" + [[package]] name = "serde" version = "1.0.196" @@ -2002,7 +1847,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -2093,7 +1938,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", - "quote", "unicode-ident", ] @@ -2108,20 +1952,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "sysinfo" -version = "0.29.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" -dependencies = [ - "cfg-if", - "core-foundation-sys", - "libc", - "ntapi", - "once_cell", - "winapi", -] - [[package]] name = "tar" version = "0.4.40" @@ -2255,7 +2085,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.21.1", ] [[package]] @@ -2277,7 +2107,18 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.5.37", +] + +[[package]] +name = "toml_edit" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.6.5", ] [[package]] @@ -2431,12 +2272,6 @@ dependencies = [ "serde", ] -[[package]] -name = "uuid" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" - [[package]] name = "vcpkg" version = "0.2.15" @@ -2459,12 +2294,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -2716,6 +2545,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.52.0" @@ -2728,12 +2566,13 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "1.1.1" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ "curve25519-dalek", - "rand_core 0.5.1", + "rand_core", + "serde", "zeroize", ] @@ -2811,32 +2650,13 @@ dependencies = [ "time", ] -[[package]] -name = "zstd" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" -dependencies = [ - "zstd-safe 6.0.6", -] - [[package]] name = "zstd" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" dependencies = [ - "zstd-safe 7.0.0", -] - -[[package]] -name = "zstd-safe" -version = "6.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" -dependencies = [ - "libc", - "zstd-sys", + "zstd-safe", ] [[package]] diff --git a/pkgs/development/tools/rye/default.nix b/pkgs/development/tools/rye/default.nix index ac748516386e..a69e96e702a4 100644 --- a/pkgs/development/tools/rye/default.nix +++ b/pkgs/development/tools/rye/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "rye"; - version = "0.31.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "rye"; rev = "refs/tags/${version}"; - hash = "sha256-hPfMKp5FUbIKKKFfoS/pxseWmhqW8UOts7DOcRzgHWU="; + hash = "sha256-sgA+Tp4Qysd07+1iNDgn9Hw0nDN8l6/fD41rE5QqWzY="; }; cargoLock = { @@ -61,6 +61,7 @@ rustPlatform.buildRustPackage rec { "--skip=test_add_flask" "--skip=test_add_from_find_links" "--skip=test_autosync_remember" + "--skip=test_basic_list" "--skip=test_basic_tool_behavior" "--skip=test_config_empty" "--skip=test_config_get_set_multiple" @@ -74,6 +75,7 @@ rustPlatform.buildRustPackage rec { "--skip=test_init_lib" "--skip=test_init_script" "--skip=test_lint_and_format" + "--skip=test_list_not_rye_managed" "--skip=test_publish_outside_project" "--skip=test_version" ]; From f579c74f3c20b7bd667b0acf21b9b0d1a2e94eec Mon Sep 17 00:00:00 2001 From: Gavin Zhao Date: Sat, 23 Mar 2024 11:37:42 -0400 Subject: [PATCH 08/73] rocmPackages: extend rocm-runtime ISA compatibility Signed-off-by: Gavin Zhao --- pkgs/development/rocm-modules/6/clr/default.nix | 6 ++++++ .../rocm-modules/6/rocm-runtime/default.nix | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/pkgs/development/rocm-modules/6/clr/default.nix b/pkgs/development/rocm-modules/6/clr/default.nix index c5a3f641ff41..f2a0ea5c5d44 100644 --- a/pkgs/development/rocm-modules/6/clr/default.nix +++ b/pkgs/development/rocm-modules/6/clr/default.nix @@ -111,6 +111,8 @@ in stdenv.mkDerivation (finalAttrs: { url = "https://github.com/ROCm/clr/commit/77c581a3ebd47b5e2908973b70adea66891159ee.patch"; hash = "sha256-auBedbd7rghlKav7A9V6l64J7VmtE9GizIdi5gWj+fs="; }) + ./0001-Improve-hipamd-compat-check.patch + ./0001-improve-rocclr-isa-compatibility-check.patch ]; postPatch = '' @@ -124,6 +126,10 @@ in stdenv.mkDerivation (finalAttrs: { substituteInPlace hipamd/src/hip_embed_pch.sh \ --replace "\''$LLVM_DIR/bin/clang" "${clang}/bin/clang" + + # https://lists.debian.org/debian-ai/2024/02/msg00178.html + substituteInPlace rocclr/utils/flags.hpp \ + --replace-fail "HIP_USE_RUNTIME_UNBUNDLER, false" "HIP_USE_RUNTIME_UNBUNDLER, true" ''; postInstall = '' diff --git a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix b/pkgs/development/rocm-modules/6/rocm-runtime/default.nix index 8c3d0cdc976d..f603b708265d 100644 --- a/pkgs/development/rocm-modules/6/rocm-runtime/default.nix +++ b/pkgs/development/rocm-modules/6/rocm-runtime/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , rocmUpdateScript , pkg-config , cmake @@ -42,6 +43,15 @@ stdenv.mkDerivation (finalAttrs: { libxml2 ]; + patches = [ + (fetchpatch { + name = "extend-isa-compatibility-check.patch"; + url = "https://salsa.debian.org/rocm-team/rocr-runtime/-/raw/076026d43bbee7f816b81fea72f984213a9ff961/debian/patches/0004-extend-isa-compatibility-check.patch"; + hash = "sha256-cC030zVGS4kNXwaztv5cwfXfVwOldpLGV9iYgEfPEnY="; + stripLen = 1; + }) + ]; + postPatch = '' patchShebangs image/blit_src/create_hsaco_ascii_file.sh patchShebangs core/runtime/trap_handler/create_trap_handler_header.sh From f1367529e9c92acb1cc1a431dae39440a045c64f Mon Sep 17 00:00:00 2001 From: Gavin Zhao Date: Sat, 23 Mar 2024 11:38:02 -0400 Subject: [PATCH 09/73] rocmPackages: extend clr ISA compatibility Signed-off-by: Gavin Zhao --- pkgs/development/rocm-modules/6/clr/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/rocm-modules/6/clr/default.nix b/pkgs/development/rocm-modules/6/clr/default.nix index f2a0ea5c5d44..3c8d20fb393a 100644 --- a/pkgs/development/rocm-modules/6/clr/default.nix +++ b/pkgs/development/rocm-modules/6/clr/default.nix @@ -111,8 +111,16 @@ in stdenv.mkDerivation (finalAttrs: { url = "https://github.com/ROCm/clr/commit/77c581a3ebd47b5e2908973b70adea66891159ee.patch"; hash = "sha256-auBedbd7rghlKav7A9V6l64J7VmtE9GizIdi5gWj+fs="; }) - ./0001-Improve-hipamd-compat-check.patch - ./0001-improve-rocclr-isa-compatibility-check.patch + (fetchpatch { + name = "Improve-hipamd-compat-check.patch"; + url = "https://github.com/GZGavinZhao/clr/commit/f52172a0767f88bf386dc615a3354156d023bdb8.patch"; + hash = "sha256-kbEeJsQgAxbNfBCPB2Jny4z526UAnIxHNQLGsD2iFvg="; + }) + (fetchpatch { + name = "improve-rocclr-isa-compatibility-check.patch"; + url = "https://github.com/GZGavinZhao/clr/commit/2783c57b0f225ad8bc553e2d244837d57d8375bc.patch"; + hash = "sha256-uQMex3gT/LqgQeMETbldpVODWorGLD/YMgjdwHlhd+M="; + }) ]; postPatch = '' From d6adc4b1d41559e3d46c88cd0fd941f9f4f063f3 Mon Sep 17 00:00:00 2001 From: Gavin Zhao Date: Sat, 23 Mar 2024 11:42:10 -0400 Subject: [PATCH 10/73] rocmPackages: extend tensile ISA compatibility Signed-off-by: Gavin Zhao --- .../rocm-modules/6/tensile/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/rocm-modules/6/tensile/default.nix b/pkgs/development/rocm-modules/6/tensile/default.nix index af33fd789e84..410264a235ee 100644 --- a/pkgs/development/rocm-modules/6/tensile/default.nix +++ b/pkgs/development/rocm-modules/6/tensile/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , rocmUpdateScript , buildPythonPackage , pytestCheckHook @@ -34,6 +35,14 @@ buildPythonPackage rec { joblib ]; + patches = [ + (fetchpatch { + name = "Extend-Tensile-HIP-ISA-compatibility.patch"; + url = "https://github.com/GZGavinZhao/Tensile/commit/855cb15839849addb0816a6dde45772034a3e41f.patch"; + hash = "sha256-d+fVf/vz+sxGqJ96vuxe0jRMgbC5K6j5FQ5SJ1e3Sl8="; + }) + ]; + doCheck = false; # Too many errors, not sure how to set this up properly nativeCheckInputs = [ @@ -42,9 +51,9 @@ buildPythonPackage rec { rocminfo ]; - preCheck = '' - export ROCM_PATH=${rocminfo} - ''; + env = { + ROCM_PATH = rocminfo; + }; pythonImportsCheck = [ "Tensile" ]; From 41f946176f12adcc897779c530e4abc9bcf396d4 Mon Sep 17 00:00:00 2001 From: Gavin Zhao Date: Sat, 23 Mar 2024 11:44:21 -0400 Subject: [PATCH 11/73] rocmPackages: extend rocblas ISA compatibility Signed-off-by: Gavin Zhao --- .../rocm-modules/6/rocblas/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/development/rocm-modules/6/rocblas/default.nix b/pkgs/development/rocm-modules/6/rocblas/default.nix index 296167bb6f28..c5c399777390 100644 --- a/pkgs/development/rocm-modules/6/rocblas/default.nix +++ b/pkgs/development/rocm-modules/6/rocblas/default.nix @@ -2,6 +2,7 @@ , lib , stdenv , fetchFromGitHub +, fetchpatch , rocmUpdateScript , runCommand , cmake @@ -21,8 +22,13 @@ , buildBenchmarks ? false , tensileLogic ? "asm_full" , tensileCOVersion ? "default" -, tensileSepArch ? true -, tensileLazyLib ? true +# https://github.com/ROCm/Tensile/issues/1757 +# Allows gfx101* users to use rocBLAS normally. +# Turn the below two values to `true` after the fix has been cherry-picked +# into a release. Just backporting that single fix is not enough because it +# depends on some previous commits. +, tensileSepArch ? false +, tensileLazyLib ? false , tensileLibFormat ? "msgpack" , gpuTargets ? [ "all" ] }: @@ -141,6 +147,14 @@ in stdenv.mkDerivation (finalAttrs: { "-DCMAKE_CXX_FLAGS=-I${amd-blis}/include/blis" ]; + patches = [ + (fetchpatch { + name = "Extend-rocBLAS-HIP-ISA-compatibility.patch"; + url = "https://github.com/GZGavinZhao/rocBLAS/commit/89b75ff9cc731f71f370fad90517395e117b03bb.patch"; + hash = "sha256-W/ohOOyNCcYYLOiQlPzsrTlNtCBdJpKVxO8s+4G7sjo="; + }) + ]; + postPatch = lib.optionalString (finalAttrs.pname != "rocblas") '' # Return early and install tensile files manually substituteInPlace library/src/CMakeLists.txt \ From e24032988f4641951e6ec635e8b7062a5dcff01f Mon Sep 17 00:00:00 2001 From: Gavin Zhao Date: Sat, 23 Mar 2024 11:54:06 -0400 Subject: [PATCH 12/73] rocmPackages: extend miopen ISA compatibility Signed-off-by: Gavin Zhao --- pkgs/development/rocm-modules/6/miopen/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/rocm-modules/6/miopen/default.nix b/pkgs/development/rocm-modules/6/miopen/default.nix index 09bcf1042953..0b57cf6592cb 100644 --- a/pkgs/development/rocm-modules/6/miopen/default.nix +++ b/pkgs/development/rocm-modules/6/miopen/default.nix @@ -116,6 +116,11 @@ in stdenv.mkDerivation (finalAttrs: { url = "https://github.com/ROCm/MIOpen/commit/3413d2daaeb44b7d6eadcc03033a5954a118491e.patch"; hash = "sha256-ST4snUcTmmSI1Ogx815KEX9GdMnmubsavDzXCGJkiKs="; }) + (fetchpatch { + name = "Extend-MIOpen-ISA-compatibility.patch"; + url = "https://github.com/GZGavinZhao/MIOpen/commit/416088b534618bd669a765afce59cfc7197064c1.patch"; + hash = "sha256-OwONCA68y8s2GqtQj+OtotXwUXQ5jM8tpeM92iaD4MU="; + }) ]; outputs = [ From e15c44956b5cd9d8001096cba220afdb037f2e03 Mon Sep 17 00:00:00 2001 From: Gavin Zhao Date: Sun, 24 Mar 2024 23:58:41 -0400 Subject: [PATCH 13/73] rocmPackages: respect NIX_BUILD_CORES and cleanup CMake options in rocblas Signed-off-by: Gavin Zhao --- .../rocm-modules/6/rocblas/default.nix | 51 ++++++++++--------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/pkgs/development/rocm-modules/6/rocblas/default.nix b/pkgs/development/rocm-modules/6/rocblas/default.nix index c5c399777390..ff5b57431b8f 100644 --- a/pkgs/development/rocm-modules/6/rocblas/default.nix +++ b/pkgs/development/rocm-modules/6/rocblas/default.nix @@ -120,31 +120,31 @@ in stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - "-Dpython=python3" - "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" - "-DBUILD_WITH_TENSILE=${if buildTensile then "ON" else "OFF"}" - # Manually define CMAKE_INSTALL_ - # See: https://github.com/NixOS/nixpkgs/pull/197838 - "-DCMAKE_INSTALL_BINDIR=bin" - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DCMAKE_INSTALL_INCLUDEDIR=include" + (lib.cmakeFeature "CMAKE_C_COMPILER" "hipcc") + (lib.cmakeFeature "CMAKE_CXX_COMPILER" "hipcc") + (lib.cmakeFeature "python" "python3") + (lib.cmakeFeature "AMDGPU_TARGETS" (lib.concatStringsSep ";" gpuTargets)) + (lib.cmakeBool "BUILD_WITH_TENSILE" buildTensile) + (lib.cmakeBool "ROCM_SYMLINK_LIBS" false) + # # Manually define CMAKE_INSTALL_ + # # See: https://github.com/NixOS/nixpkgs/pull/197838 + # "-DCMAKE_INSTALL_BINDIR=bin" + # "-DCMAKE_INSTALL_LIBDIR=lib" + # "-DCMAKE_INSTALL_INCLUDEDIR=include" + (lib.cmakeBool "BUILD_CLIENTS_TESTS" buildTests) + (lib.cmakeBool "BUILD_CLIENTS_BENCHMARKS" buildBenchmarks) ] ++ lib.optionals buildTensile [ - "-DVIRTUALENV_HOME_DIR=/build/source/tensile" - "-DTensile_TEST_LOCAL_PATH=/build/source/tensile" - "-DTensile_ROOT=/build/source/tensile/${python3.sitePackages}/Tensile" - "-DTensile_LOGIC=${tensileLogic}" - "-DTensile_CODE_OBJECT_VERSION=${tensileCOVersion}" - "-DTensile_SEPARATE_ARCHITECTURES=${if tensileSepArch then "ON" else "OFF"}" - "-DTensile_LAZY_LIBRARY_LOADING=${if tensileLazyLib then "ON" else "OFF"}" - "-DTensile_LIBRARY_FORMAT=${tensileLibFormat}" - ] ++ lib.optionals buildTests [ - "-DBUILD_CLIENTS_TESTS=ON" - ] ++ lib.optionals buildBenchmarks [ - "-DBUILD_CLIENTS_BENCHMARKS=ON" + (lib.cmakeFeature "VIRTUALENV_HOME_DIR" "/build/source/tensile") + (lib.cmakeFeature "Tensile_TEST_LOCAL_PATH" "/build/source/tensile") + (lib.cmakeFeature "Tensile_ROOT" "/build/source/tensile/${python3.sitePackages}/Tensile") + (lib.cmakeFeature "Tensile_LOGIC" tensileLogic) + (lib.cmakeFeature "Tensile_CODE_OBJECT_VERSION" tensileCOVersion) + (lib.cmakeBool "Tensile_SEPARATE_ARCHITECTURES" tensileSepArch) + (lib.cmakeBool "Tensile_LAZY_LIBRARY_LOADING" tensileLazyLib) + (lib.cmakeFeature "Tensile_LIBRARY_FORMAT" tensileLibFormat) + (lib.cmakeBool "Tensile_PRINT_DEBUG" true) ] ++ lib.optionals (buildTests || buildBenchmarks) [ - "-DCMAKE_CXX_FLAGS=-I${amd-blis}/include/blis" + (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-I${amd-blis}/include/blis") ]; patches = [ @@ -155,7 +155,10 @@ in stdenv.mkDerivation (finalAttrs: { }) ]; - postPatch = lib.optionalString (finalAttrs.pname != "rocblas") '' + postPatch = '' + substituteInPlace cmake/build-options.cmake \ + --replace-fail 'Tensile_CPU_THREADS ""' 'Tensile_CPU_THREADS "$ENV{NIX_BUILD_CORES}"' + '' + lib.optionalString (finalAttrs.pname != "rocblas") '' # Return early and install tensile files manually substituteInPlace library/src/CMakeLists.txt \ --replace "set_target_properties( TensileHost PROPERTIES OUTPUT_NAME" "return()''\nset_target_properties( TensileHost PROPERTIES OUTPUT_NAME" From f4f68f4f6bb8b7c41f4d8fa68f44e0824b068a67 Mon Sep 17 00:00:00 2001 From: Gavin Zhao Date: Thu, 28 Mar 2024 11:16:00 -0400 Subject: [PATCH 14/73] rocmPackages: cleanup and remove double building for rocblas Signed-off-by: Gavin Zhao --- .../rocm-modules/6/rocblas/default.nix | 105 +----------------- .../rocm-modules/6/tensile/default.nix | 5 + 2 files changed, 10 insertions(+), 100 deletions(-) diff --git a/pkgs/development/rocm-modules/6/rocblas/default.nix b/pkgs/development/rocm-modules/6/rocblas/default.nix index ff5b57431b8f..e6b7ed34717c 100644 --- a/pkgs/development/rocm-modules/6/rocblas/default.nix +++ b/pkgs/development/rocm-modules/6/rocblas/default.nix @@ -33,51 +33,7 @@ , gpuTargets ? [ "all" ] }: -let - # NOTE: Update the default GPU targets on every update - gfx80 = (rocblas.override { - gpuTargets = [ - "gfx803" - ]; - }).overrideAttrs { pname = "rocblas-tensile-gfx80"; }; - - gfx90 = (rocblas.override { - gpuTargets = [ - "gfx900" - "gfx906:xnack-" - "gfx908:xnack-" - "gfx90a:xnack+" - "gfx90a:xnack-" - ]; - }).overrideAttrs { pname = "rocblas-tensile-gfx90"; }; - - gfx94 = (rocblas.override { - gpuTargets = [ - "gfx940" - "gfx941" - "gfx942" - ]; - }).overrideAttrs { pname = "rocblas-tensile-gfx94"; }; - - gfx10 = (rocblas.override { - gpuTargets = [ - "gfx1010" - "gfx1012" - "gfx1030" - ]; - }).overrideAttrs { pname = "rocblas-tensile-gfx10"; }; - - gfx11 = (rocblas.override { - gpuTargets = [ - "gfx1100" - "gfx1101" - "gfx1102" - ]; - }).overrideAttrs { pname = "rocblas-tensile-gfx11"; }; - - # Unfortunately, we have to do two full builds, otherwise we get overlapping _fallback.dat files - fallbacks = rocblas.overrideAttrs { pname = "rocblas-tensile-fallbacks"; }; -in stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "rocblas"; version = "6.0.2"; @@ -100,6 +56,7 @@ in stdenv.mkDerivation (finalAttrs: { cmake rocm-cmake clr + tensile ]; buildInputs = [ @@ -126,17 +83,11 @@ in stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "AMDGPU_TARGETS" (lib.concatStringsSep ";" gpuTargets)) (lib.cmakeBool "BUILD_WITH_TENSILE" buildTensile) (lib.cmakeBool "ROCM_SYMLINK_LIBS" false) - # # Manually define CMAKE_INSTALL_ - # # See: https://github.com/NixOS/nixpkgs/pull/197838 - # "-DCMAKE_INSTALL_BINDIR=bin" - # "-DCMAKE_INSTALL_LIBDIR=lib" - # "-DCMAKE_INSTALL_INCLUDEDIR=include" + (lib.cmakeFeature "ROCBLAS_TENSILE_LIBRARY_DIR" "lib/rocblas") (lib.cmakeBool "BUILD_CLIENTS_TESTS" buildTests) (lib.cmakeBool "BUILD_CLIENTS_BENCHMARKS" buildBenchmarks) ] ++ lib.optionals buildTensile [ - (lib.cmakeFeature "VIRTUALENV_HOME_DIR" "/build/source/tensile") - (lib.cmakeFeature "Tensile_TEST_LOCAL_PATH" "/build/source/tensile") - (lib.cmakeFeature "Tensile_ROOT" "/build/source/tensile/${python3.sitePackages}/Tensile") + (lib.cmakeBool "BUILD_WITH_PIP" false) (lib.cmakeFeature "Tensile_LOGIC" tensileLogic) (lib.cmakeFeature "Tensile_CODE_OBJECT_VERSION" tensileCOVersion) (lib.cmakeBool "Tensile_SEPARATE_ARCHITECTURES" tensileSepArch) @@ -155,56 +106,10 @@ in stdenv.mkDerivation (finalAttrs: { }) ]; + # Pass $NIX_BUILD_CORES to Tensile postPatch = '' substituteInPlace cmake/build-options.cmake \ --replace-fail 'Tensile_CPU_THREADS ""' 'Tensile_CPU_THREADS "$ENV{NIX_BUILD_CORES}"' - '' + lib.optionalString (finalAttrs.pname != "rocblas") '' - # Return early and install tensile files manually - substituteInPlace library/src/CMakeLists.txt \ - --replace "set_target_properties( TensileHost PROPERTIES OUTPUT_NAME" "return()''\nset_target_properties( TensileHost PROPERTIES OUTPUT_NAME" - '' + lib.optionalString (buildTensile && finalAttrs.pname == "rocblas") '' - # Link the prebuilt Tensile files - mkdir -p build/Tensile/library - - for path in ${gfx80} ${gfx90} ${gfx94} ${gfx10} ${gfx11} ${fallbacks}; do - ln -s $path/lib/rocblas/library/* build/Tensile/library - done - - unlink build/Tensile/library/TensileManifest.txt - '' + lib.optionalString buildTensile '' - # Tensile REALLY wants to write to the nix directory if we include it normally - cp -a ${tensile} tensile - chmod +w -R tensile - - # Rewrap Tensile - substituteInPlace tensile/bin/{.t*,.T*,*} \ - --replace "${tensile}" "/build/source/tensile" - - substituteInPlace CMakeLists.txt \ - --replace "include(virtualenv)" "" \ - --replace "virtualenv_install(\''${Tensile_TEST_LOCAL_PATH})" "" - ''; - - postInstall = lib.optionalString (finalAttrs.pname == "rocblas") '' - ln -sf ${fallbacks}/lib/rocblas/library/TensileManifest.txt $out/lib/rocblas/library - '' + lib.optionalString (finalAttrs.pname != "rocblas") '' - mkdir -p $out/lib/rocblas/library - rm -rf $out/share - '' + lib.optionalString (finalAttrs.pname != "rocblas" && finalAttrs.pname != "rocblas-tensile-fallbacks") '' - rm Tensile/library/{TensileManifest.txt,*_fallback.dat} - mv Tensile/library/* $out/lib/rocblas/library - '' + lib.optionalString (finalAttrs.pname == "rocblas-tensile-fallbacks") '' - mv Tensile/library/{TensileManifest.txt,*_fallback.dat} $out/lib/rocblas/library - '' + lib.optionalString buildTests '' - mkdir -p $test/bin - cp -a $out/bin/* $test/bin - rm $test/bin/*-bench || true - '' + lib.optionalString buildBenchmarks '' - mkdir -p $benchmark/bin - cp -a $out/bin/* $benchmark/bin - rm $benchmark/bin/*-test || true - '' + lib.optionalString (buildTests || buildBenchmarks ) '' - rm -rf $out/bin ''; passthru.updateScript = rocmUpdateScript { diff --git a/pkgs/development/rocm-modules/6/tensile/default.nix b/pkgs/development/rocm-modules/6/tensile/default.nix index 410264a235ee..6df403249e9a 100644 --- a/pkgs/development/rocm-modules/6/tensile/default.nix +++ b/pkgs/development/rocm-modules/6/tensile/default.nix @@ -41,6 +41,11 @@ buildPythonPackage rec { url = "https://github.com/GZGavinZhao/Tensile/commit/855cb15839849addb0816a6dde45772034a3e41f.patch"; hash = "sha256-d+fVf/vz+sxGqJ96vuxe0jRMgbC5K6j5FQ5SJ1e3Sl8="; }) + (fetchpatch { + name = "Don-t-copy-file-twice-in-copyStaticFiles.patch"; + url = "https://github.com/GZGavinZhao/Tensile/commit/9e14d5a00a096bddac605910a0e4dfb4c35bb0d5.patch"; + hash = "sha256-gOzjJyD1K056OFQ+hK5nbUeBhxLTIgQLoT+0K12SypI="; + }) ]; doCheck = false; # Too many errors, not sure how to set this up properly From d276a67466c27e39ba4d343d6f54006d09446a31 Mon Sep 17 00:00:00 2001 From: Gavin Zhao Date: Thu, 28 Mar 2024 11:45:58 -0400 Subject: [PATCH 15/73] rocmPackages: don't build arches in parallel in rccl Signed-off-by: Gavin Zhao --- pkgs/development/rocm-modules/6/rccl/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/rocm-modules/6/rccl/default.nix b/pkgs/development/rocm-modules/6/rccl/default.nix index cdbbd70440c2..a830883b4f82 100644 --- a/pkgs/development/rocm-modules/6/rccl/default.nix +++ b/pkgs/development/rocm-modules/6/rccl/default.nix @@ -65,7 +65,9 @@ stdenv.mkDerivation (finalAttrs: { # Really strange behavior, `#!/usr/bin/env perl` should work... substituteInPlace CMakeLists.txt \ - --replace "\''$ \''${hipify-perl_executable}" "${perl}/bin/perl ${hipify}/bin/hipify-perl" + --replace "\''$ \''${hipify-perl_executable}" "${perl}/bin/perl ${hipify}/bin/hipify-perl" \ + --replace-warn "-parallel-jobs=12" "-parallel-jobs=1" \ + --replace-warn "-parallel-jobs=16" "-parallel-jobs=1" ''; postInstall = lib.optionalString buildTests '' From 73e919d8b76ea437b77512e819ed9c3711193775 Mon Sep 17 00:00:00 2001 From: Gavin Zhao Date: Fri, 29 Mar 2024 10:48:59 -0400 Subject: [PATCH 16/73] rocmPackages: install headers correctly in rocblas Signed-off-by: Gavin Zhao --- pkgs/development/rocm-modules/6/rocblas/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/rocm-modules/6/rocblas/default.nix b/pkgs/development/rocm-modules/6/rocblas/default.nix index e6b7ed34717c..f1c709dc79fc 100644 --- a/pkgs/development/rocm-modules/6/rocblas/default.nix +++ b/pkgs/development/rocm-modules/6/rocblas/default.nix @@ -86,6 +86,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "ROCBLAS_TENSILE_LIBRARY_DIR" "lib/rocblas") (lib.cmakeBool "BUILD_CLIENTS_TESTS" buildTests) (lib.cmakeBool "BUILD_CLIENTS_BENCHMARKS" buildBenchmarks) + # rocblas header files are not installed unless we set this + (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") ] ++ lib.optionals buildTensile [ (lib.cmakeBool "BUILD_WITH_PIP" false) (lib.cmakeFeature "Tensile_LOGIC" tensileLogic) From 7ff6984fd3e0a063b22c00ca56a7bfe502326cba Mon Sep 17 00:00:00 2001 From: Gavin Zhao Date: Wed, 3 Apr 2024 01:05:46 -0400 Subject: [PATCH 17/73] rocmPackages: fix dependencies in rocblas Signed-off-by: Gavin Zhao --- pkgs/development/rocm-modules/6/rocblas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/rocm-modules/6/rocblas/default.nix b/pkgs/development/rocm-modules/6/rocblas/default.nix index f1c709dc79fc..9dfa8636f120 100644 --- a/pkgs/development/rocm-modules/6/rocblas/default.nix +++ b/pkgs/development/rocm-modules/6/rocblas/default.nix @@ -1,5 +1,4 @@ -{ rocblas -, lib +{ lib , stdenv , fetchFromGitHub , fetchpatch @@ -56,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: { cmake rocm-cmake clr + ] ++ lib.optionals buildTensile [ tensile ]; From e30bae6a69fc77dd5c573d42fc7c8e0490d0b63c Mon Sep 17 00:00:00 2001 From: Gavin Zhao Date: Wed, 3 Apr 2024 01:23:05 -0400 Subject: [PATCH 18/73] rocmPackages: fetch patches from Debian if possible Signed-off-by: Gavin Zhao --- pkgs/development/rocm-modules/6/clr/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/rocm-modules/6/clr/default.nix b/pkgs/development/rocm-modules/6/clr/default.nix index 3c8d20fb393a..dedda194c828 100644 --- a/pkgs/development/rocm-modules/6/clr/default.nix +++ b/pkgs/development/rocm-modules/6/clr/default.nix @@ -112,14 +112,14 @@ in stdenv.mkDerivation (finalAttrs: { hash = "sha256-auBedbd7rghlKav7A9V6l64J7VmtE9GizIdi5gWj+fs="; }) (fetchpatch { - name = "Improve-hipamd-compat-check.patch"; - url = "https://github.com/GZGavinZhao/clr/commit/f52172a0767f88bf386dc615a3354156d023bdb8.patch"; - hash = "sha256-kbEeJsQgAxbNfBCPB2Jny4z526UAnIxHNQLGsD2iFvg="; + name = "extend-hip-isa-compatibility-check.patch"; + url = "https://salsa.debian.org/rocm-team/rocm-hipamd/-/raw/d6d20142c37e1dff820950b16ff8f0523241d935/debian/patches/0026-extend-hip-isa-compatibility-check.patch"; + hash = "sha256-eG0ALZZQLRzD7zJueJFhi2emontmYy6xx8Rsm346nQI="; }) (fetchpatch { name = "improve-rocclr-isa-compatibility-check.patch"; - url = "https://github.com/GZGavinZhao/clr/commit/2783c57b0f225ad8bc553e2d244837d57d8375bc.patch"; - hash = "sha256-uQMex3gT/LqgQeMETbldpVODWorGLD/YMgjdwHlhd+M="; + url = "https://salsa.debian.org/rocm-team/rocm-hipamd/-/raw/d6d20142c37e1dff820950b16ff8f0523241d935/debian/patches/0025-improve-rocclr-isa-compatibility-check.patch"; + hash = "sha256-8eowuRiOAdd9ucKv4Eg9FPU7c6367H3eP3fRAGfXc6Y="; }) ]; From 45b3242ab43885004198f9ae0bd79db4b7d97abe Mon Sep 17 00:00:00 2001 From: Gavin Zhao Date: Wed, 3 Apr 2024 01:28:19 -0400 Subject: [PATCH 19/73] rocmPackages: add isa conversion patch in rocprim Signed-off-by: Gavin Zhao --- pkgs/development/rocm-modules/6/rocprim/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/rocm-modules/6/rocprim/default.nix b/pkgs/development/rocm-modules/6/rocprim/default.nix index e9996cae61e7..3e8525655141 100644 --- a/pkgs/development/rocm-modules/6/rocprim/default.nix +++ b/pkgs/development/rocm-modules/6/rocprim/default.nix @@ -1,4 +1,5 @@ { lib +, fetchpatch , stdenv , fetchFromGitHub , rocmUpdateScript @@ -31,6 +32,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-nWvq26qRPZ6Au1rc5cR74TKArcdUFg7O9djFi8SvMeM="; }; + patches = [ + (fetchpatch { + name = "arch-conversion-marco.patch"; + url = "https://salsa.debian.org/rocm-team/rocprim/-/raw/70c8aaee3cf545d92685f4ed9bf8f41e3d4d570c/debian/patches/arch-conversion-macro.patch"; + hash = "sha256-oXdmbCArOB5bKE8ozDFrSh4opbO+c4VI6PNhljeUSms="; + }) + ]; + nativeBuildInputs = [ cmake rocm-cmake From 7bbde1756d70eacb2f3ba5ec8e8a34de28e801b2 Mon Sep 17 00:00:00 2001 From: Gavin Zhao Date: Wed, 3 Apr 2024 02:13:22 -0400 Subject: [PATCH 20/73] rocmPackages: no need to pass rocblas to itself Signed-off-by: Gavin Zhao --- pkgs/development/rocm-modules/6/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix index 567b5bee4f72..e74df33a7bfb 100644 --- a/pkgs/development/rocm-modules/6/default.nix +++ b/pkgs/development/rocm-modules/6/default.nix @@ -194,7 +194,7 @@ in rec { }; rocblas = callPackage ./rocblas { - inherit rocblas rocmUpdateScript rocm-cmake clr tensile; + inherit rocmUpdateScript rocm-cmake clr tensile; inherit (llvm) openmp; stdenv = llvm.rocmClangStdenv; }; From 32b9f37d57826364db0bc579ee75fa82af1fd623 Mon Sep 17 00:00:00 2001 From: Gavin Zhao Date: Wed, 24 Apr 2024 22:22:11 -0400 Subject: [PATCH 21/73] rocmPackages.rocblas: do not build for gfx1012, gfx940, and gfx 941 GPU targets Signed-off-by: Gavin Zhao --- pkgs/development/rocm-modules/6/rocblas/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/rocm-modules/6/rocblas/default.nix b/pkgs/development/rocm-modules/6/rocblas/default.nix index 9dfa8636f120..6bfb76532263 100644 --- a/pkgs/development/rocm-modules/6/rocblas/default.nix +++ b/pkgs/development/rocm-modules/6/rocblas/default.nix @@ -29,7 +29,7 @@ , tensileSepArch ? false , tensileLazyLib ? false , tensileLibFormat ? "msgpack" -, gpuTargets ? [ "all" ] +, gpuTargets ? [ "gfx900;gfx906:xnack-;gfx908:xnack-;gfx90a:xnack+;gfx90a:xnack-;gfx942;gfx1010;gfx1030;gfx1100;gfx1101;gfx1102" ] }: stdenv.mkDerivation (finalAttrs: { From c3848d59c9506ce6e54e6c1d52670a6191e427ea Mon Sep 17 00:00:00 2001 From: Gavin Zhao Date: Thu, 25 Apr 2024 11:45:45 -0400 Subject: [PATCH 22/73] rocmPackages.rocblas: add comments about why some GPU archs are not built Signed-off-by: Gavin Zhao --- pkgs/development/rocm-modules/6/rocblas/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/rocm-modules/6/rocblas/default.nix b/pkgs/development/rocm-modules/6/rocblas/default.nix index 6bfb76532263..f93cceddd68a 100644 --- a/pkgs/development/rocm-modules/6/rocblas/default.nix +++ b/pkgs/development/rocm-modules/6/rocblas/default.nix @@ -29,6 +29,14 @@ , tensileSepArch ? false , tensileLazyLib ? false , tensileLibFormat ? "msgpack" +# `gfx940`, `gfx941` are not present in this list because they are early +# engineering samples, and all final MI300 hardware are `gfx942`: +# https://github.com/NixOS/nixpkgs/pull/298388#issuecomment-2032791130 +# +# `gfx1012` is not present in this list because the ISA compatibility patches +# would force all `gfx101*` GPUs to run as `gfx1010`, so `gfx101*` GPUs will +# always try to use `gfx1010` code objects, hence building for `gfx1012` is +# useless: https://github.com/NixOS/nixpkgs/pull/298388#issuecomment-2076327152 , gpuTargets ? [ "gfx900;gfx906:xnack-;gfx908:xnack-;gfx90a:xnack+;gfx90a:xnack-;gfx942;gfx1010;gfx1030;gfx1100;gfx1101;gfx1102" ] }: From f6e034c42e19157a4a8ba45d106f09669985b516 Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Fri, 26 Apr 2024 16:01:48 +1000 Subject: [PATCH 23/73] python3Packages.pystemd: Move runtime dependencies to propagatedBuildInputs --- pkgs/development/python-modules/pystemd/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pystemd/default.nix b/pkgs/development/python-modules/pystemd/default.nix index 43d51869ffb8..7e77bd072c03 100644 --- a/pkgs/development/python-modules/pystemd/default.nix +++ b/pkgs/development/python-modules/pystemd/default.nix @@ -25,7 +25,9 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; - nativeCheckInputs = [ lxml mock psutil pytest ]; + propagatedBuildInputs = [ lxml psutil ]; + + nativeCheckInputs = [ mock pytest ]; checkPhase = "pytest tests"; From 3bcba25270188c1c19131f682d650cbd56511d81 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 26 Apr 2024 08:38:27 +0200 Subject: [PATCH 24/73] alock: unstable-2017-07-20 -> 2.5.1 --- pkgs/misc/screensavers/alock/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index 65a04839096f..bbe0c75350f3 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "alock"; - version = "unstable-2017-07-20"; + version = "2.5.1"; src = fetchFromGitHub { owner = "Arkq"; repo = "alock"; - rev = "2035e1d4a2293432f5503e82d10f899232eb0f38"; - sha256 = "sha256-Rm00ytSfEv5Wljz4f/4bbyrK3sCV/oRUwz4DKx0pya8="; + rev = "refs/tags/v${version}"; + hash = "sha256-xfPhsXZrTlEqea75SvacDfjM9o21MTudrqfNN9xtdcg="; }; PAM_DEFAULT_SERVICE = "login"; From d80c38e75369b2d54599f3c55a3c59a400d32446 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 26 Apr 2024 08:44:05 +0200 Subject: [PATCH 25/73] alock: add update script --- pkgs/misc/screensavers/alock/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index bbe0c75350f3..4fcee6fa9b10 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook +{ lib, stdenv, fetchFromGitHub, gitUpdater, pkg-config, autoreconfHook , libX11, pam, libgcrypt, libXrender, imlib2 }: stdenv.mkDerivation rec { @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { pam libgcrypt libXrender imlib2 ]; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + ignoredVersions = "^[^.]+$"; # ignore versions without a dot + }; + meta = with lib; { homepage = "https://github.com/Arkq/alock"; description = "Simple screen lock application for X server"; From ec6915ff518ff28ea419f798640d6f62839ff06d Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 15:34:27 +0200 Subject: [PATCH 26/73] azure-cli: allow manual packaging of extensions with dependencies Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 93ba305ae894..e376c5ab8161 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -39,8 +39,8 @@ let , url , sha256 , description - }: python3.pkgs.buildPythonPackage { - inherit pname version; + , ... + }@args: python3.pkgs.buildPythonPackage ({ format = "wheel"; src = fetchurl { inherit url sha256; }; meta = with lib; { @@ -51,7 +51,7 @@ let license = lib.licenses.mit; sourceProvenance = [ sourceTypes.fromSource ]; }; - }; + } // (removeAttrs args [ "url" "sha256" "description" ])); extensions = callPackages ./extensions-generated.nix { inherit mkAzExtension; }; From d566b7894a3f6fa043f5637e247650d3fe7db218 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Fri, 26 Apr 2024 15:35:22 +0200 Subject: [PATCH 27/73] azure-cli-extensions.azure-devops: init at 1.0.0 Co-authored-by: Oliver Breitwieser Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/tools/admin/azure-cli/default.nix | 4 +++- pkgs/tools/admin/azure-cli/extensions-manual.nix | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/admin/azure-cli/extensions-manual.nix diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index e376c5ab8161..49d3b6ffb139 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -53,7 +53,9 @@ let }; } // (removeAttrs args [ "url" "sha256" "description" ])); - extensions = callPackages ./extensions-generated.nix { inherit mkAzExtension; }; + extensions = + callPackages ./extensions-generated.nix { inherit mkAzExtension; } + // callPackages ./extensions-manual.nix { inherit mkAzExtension; }; extensionDir = stdenvNoCC.mkDerivation { name = "azure-cli-extensions"; diff --git a/pkgs/tools/admin/azure-cli/extensions-manual.nix b/pkgs/tools/admin/azure-cli/extensions-manual.nix new file mode 100644 index 000000000000..e69888b216b9 --- /dev/null +++ b/pkgs/tools/admin/azure-cli/extensions-manual.nix @@ -0,0 +1,16 @@ +{ mkAzExtension +, python3Packages +}: + +{ + azure-devops = mkAzExtension rec { + pname = "azure-devops"; + version = "1.0.0"; + url = "https://github.com/Azure/azure-devops-cli-extension/releases/download/20240206.1/azure_devops-${version}-py2.py3-none-any.whl"; + sha256 = "658a2854d8c80f874f9382d421fa45abf6a38d00334737dda006f8dec64cf70a"; + description = "Tools for managing Azure DevOps"; + propagatedBuildInputs = with python3Packages; [ + distro + ]; + }; +} From c49f275120abb91fe54f018b67e0e0433c56bf72 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 27 Apr 2024 22:11:12 +0200 Subject: [PATCH 28/73] zed-editor: 0.132.2 -> 0.132.3 Diff: https://github.com/zed-industries/zed/compare/refs/tags/v0.132.2...0.132.3 Changelog: https://github.com/zed-industries/zed/releases/tag/v0.132.3 --- pkgs/by-name/ze/zed-editor/Cargo.lock | 96 +++++++++++++------------- pkgs/by-name/ze/zed-editor/package.nix | 6 +- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/Cargo.lock b/pkgs/by-name/ze/zed-editor/Cargo.lock index 742e22d14ae8..4c7a03238d09 100644 --- a/pkgs/by-name/ze/zed-editor/Cargo.lock +++ b/pkgs/by-name/ze/zed-editor/Cargo.lock @@ -643,7 +643,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -710,7 +710,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -741,7 +741,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -1385,7 +1385,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.48", + "syn 2.0.59", "which 4.4.2", ] @@ -1468,7 +1468,7 @@ source = "git+https://github.com/kvark/blade?rev=810ec594358aafea29a4a3d8ab601d2 dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -1634,7 +1634,7 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -2019,7 +2019,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -2958,7 +2958,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -3441,7 +3441,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -3942,7 +3942,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -4185,7 +4185,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -5046,7 +5046,7 @@ checksum = "ce243b1bfa62ffc028f1cc3b6034ec63d649f3031bc8a4fbbb004e1ac17d1f68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -5667,7 +5667,7 @@ checksum = "ba125974b109d512fccbc6c0244e7580143e460895dfd6ea7f8bbb692fd94396" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -5902,9 +5902,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.3" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memfd" @@ -6624,7 +6624,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -6700,7 +6700,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -6780,7 +6780,7 @@ checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -6958,7 +6958,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -7009,7 +7009,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -7233,7 +7233,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -7290,9 +7290,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -7313,7 +7313,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -8136,7 +8136,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.48", + "syn 2.0.59", "walkdir", ] @@ -8410,7 +8410,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -8451,7 +8451,7 @@ dependencies = [ "proc-macro2", "quote", "sea-bae", - "syn 2.0.48", + "syn 2.0.59", "unicode-ident", ] @@ -8635,7 +8635,7 @@ checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -8700,7 +8700,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -9465,7 +9465,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -9594,9 +9594,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a" dependencies = [ "proc-macro2", "quote", @@ -9961,7 +9961,7 @@ checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -10140,7 +10140,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -10365,7 +10365,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -10433,7 +10433,7 @@ dependencies = [ [[package]] name = "tree-sitter" version = "0.20.100" -source = "git+https://github.com/tree-sitter/tree-sitter?rev=7f21c3b98c0749ac192da67a0d65dfe3eabc4a63#7f21c3b98c0749ac192da67a0d65dfe3eabc4a63" +source = "git+https://github.com/tree-sitter/tree-sitter?rev=7b4894ba2ae81b988846676f54c0988d4027ef4f#7b4894ba2ae81b988846676f54c0988d4027ef4f" dependencies = [ "cc", "regex", @@ -11132,7 +11132,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", "wasm-bindgen-shared", ] @@ -11166,7 +11166,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -11303,7 +11303,7 @@ dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", "wasmtime-component-util", "wasmtime-wit-bindgen", "wit-parser", @@ -11464,7 +11464,7 @@ checksum = "6d6d967f01032da7d4c6303da32f6a00d5efe1bac124b156e7342d8ace6ffdfc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -11744,7 +11744,7 @@ dependencies = [ "proc-macro2", "quote", "shellexpand", - "syn 2.0.48", + "syn 2.0.59", "witx", ] @@ -11756,7 +11756,7 @@ checksum = "512d816dbcd0113103b2eb2402ec9018e7f0755202a5b3e67db726f229d8dcae" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", "wiggle-generate", ] @@ -11874,7 +11874,7 @@ checksum = "942ac266be9249c84ca862f0a164a39533dc2f6f33dc98ec89c8da99b82ea0bd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -11885,7 +11885,7 @@ checksum = "da33557140a288fae4e1d5f8873aaf9eb6613a9cf82c3e070223ff177f598b60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -12202,7 +12202,7 @@ dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", "wit-bindgen-core", "wit-bindgen-rust", ] @@ -12520,7 +12520,7 @@ dependencies = [ [[package]] name = "zed" -version = "0.132.2" +version = "0.132.3" dependencies = [ "activity_indicator", "anyhow", @@ -12811,7 +12811,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] @@ -12831,7 +12831,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.59", ] [[package]] diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 6ca00045ab4f..cb9da85157d7 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -27,13 +27,13 @@ rustPlatform.buildRustPackage rec { pname = "zed"; - version = "0.132.2"; + version = "0.132.3"; src = fetchFromGitHub { owner = "zed-industries"; repo = "zed"; rev = "refs/tags/v${version}"; - hash = "sha256-KojFa22CLne36kGfMvZGWjo2Ae3tjYAfL371c0qe/Bk="; + hash = "sha256-EuoUDke8vBPQkiMa9WlP2K3FroIBBAVNJRjsRx4rkO0="; fetchSubmodules = true; }; @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { "nvim-rs-0.6.0-pre" = "sha256-bdWWuCsBv01mnPA5e5zRpq48BgOqaqIcAu+b7y1NnM8="; "pathfinder_simd-0.5.3" = "sha256-bakBcAQZJdHQPXybe0zoMzE49aOHENQY7/ZWZUMt+pM="; "taffy-0.3.11" = "sha256-0hXOEj6IjSW8e1t+rvxBFX6V9XRum3QO2Des1XlHJEw="; - "tree-sitter-0.20.100" = "sha256-k8au4++UJyaOCNo0cqokaQ5Is3BmIiCBSxiUkbrzhFQ="; + "tree-sitter-0.20.100" = "sha256-xZDWAjNIhWC2n39H7jJdKDgyE/J6+MAVSa8dHtZ6CLE="; "tree-sitter-bash-0.20.4" = "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM="; "tree-sitter-cpp-0.20.0" = "sha256-2QYEFkpwcRmh2kf4qEAL2a5lGSa316CetOhF73e7rEM="; "tree-sitter-css-0.19.0" = "sha256-5Qti/bFac2A1PJxqZEOuSLK3GGKYwPDKAp3OOassBxU="; From 00531012f0346c045475a7243c9d72902f7314ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Apr 2024 00:05:20 +0000 Subject: [PATCH 29/73] guacamole-client: 1.5.4 -> 1.5.5 --- pkgs/servers/guacamole-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/guacamole-client/default.nix b/pkgs/servers/guacamole-client/default.nix index 23c56df62a46..e3a142983ad7 100644 --- a/pkgs/servers/guacamole-client/default.nix +++ b/pkgs/servers/guacamole-client/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "guacamole-client"; - version = "1.5.4"; + version = "1.5.5"; src = fetchurl { url = "https://archive.apache.org/dist/guacamole/${finalAttrs.version}/binary/guacamole-${finalAttrs.version}.war"; - hash = "sha256-Vyi1Y5Eb1kvOCguBx06ozLIZDReFv/NAMPxohagnPT4="; + hash = "sha256-QmcwfzYAZjcj8kr5LVlumcg1lCUxUTUFKkLUUflSkgA="; }; dontUnpack = true; From 505d953e93ee78d08327360e81355041e9485e94 Mon Sep 17 00:00:00 2001 From: kotatsuyaki Date: Sun, 28 Apr 2024 10:05:58 +0800 Subject: [PATCH 30/73] maintainers: add kotatsuyaki --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ddeca615d702..82f60cafb157 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10804,6 +10804,12 @@ githubId = 2037002; name = "Konstantinos"; }; + kotatsuyaki = { + email = "kotatsuyaki@mail.kotatsu.dev"; + github = "kotatsuyaki"; + githubId = 17219127; + name = "kotatsuyaki"; + }; kouyk = { email = "skykinetic@stevenkou.xyz"; github = "kouyk"; From 3c0122a42a73f8ff511c661159f04ebef1759073 Mon Sep 17 00:00:00 2001 From: kotatsuyaki Date: Sun, 28 Apr 2024 10:06:15 +0800 Subject: [PATCH 31/73] emacsPackages.xapian-lite: add kotatsuyaki to maintainers --- .../elisp-packages/manual-packages/xapian-lite/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix index 1b48776f7560..0f9da8136214 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://git.sr.ht/~casouri/xapian-lite"; description = "A minimal Emacs dynamic module for Xapian"; - maintainers = [ ]; + maintainers = [ lib.maintainers.kotatsuyaki ]; license = lib.licenses.gpl3Plus; inherit (emacs.meta) platforms; }; From 10e3506904ab96b8ef0556f2b22e6b1a47d2ceaa Mon Sep 17 00:00:00 2001 From: toastal Date: Sun, 28 Apr 2024 15:32:44 +0700 Subject: [PATCH 32/73] movim: add patch for bcrypt error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See the issue on Movim’s proprietary issue tracker: https://github.com/movim/movim/issues/1311 --- pkgs/by-name/mo/movim/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix index 1c0d5863dfa1..d6643e0c7d3a 100644 --- a/pkgs/by-name/mo/movim/package.nix +++ b/pkgs/by-name/mo/movim/package.nix @@ -48,6 +48,13 @@ php.buildComposerProject (finalAttrs: { hash = "sha256-t63POjywZLk5ulppuCedFhhEhOsnB90vy3k/HhM3MGc="; }; + patches = [ + (fetchpatch { + url = "https://github.com/movim/movim/commit/4dd2842f4617f3baaa166157892a532ad07df80d.patch"; + hash = "sha256-32MLS5g60Rhm8HQDBPnUo9k+aB7L8dNMcnSjPIlooks="; + }) + ]; + php = php.buildEnv ({ extensions = ({ all, enabled }: enabled From 13852fc9ad82314bde3de1badb4097eb7526d921 Mon Sep 17 00:00:00 2001 From: toastal Date: Sat, 27 Apr 2024 10:12:01 +0700 Subject: [PATCH 33/73] movim: remove parallel dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently there is an issue with $PATH & parallel causing build errors. It’s probably best to just remove the dependency where bash forking is good enough here. --- nixos/modules/services/web-apps/movim.nix | 22 ++++----- pkgs/by-name/mo/movim/package.nix | 58 ++++++++++------------- 2 files changed, 34 insertions(+), 46 deletions(-) diff --git a/nixos/modules/services/web-apps/movim.nix b/nixos/modules/services/web-apps/movim.nix index bb88a185b461..29bed0e067fa 100644 --- a/nixos/modules/services/web-apps/movim.nix +++ b/nixos/modules/services/web-apps/movim.nix @@ -103,22 +103,20 @@ let lib.concatStringsSep "\n" [ (lib.optionalString brotli.enable '' echo -n "Precompressing static files with Brotli …" - find ${appDir}/public -type f ${findTextFileNames} \ - | ${lib.getExe pkgs.parallel} ${lib.escapeShellArgs [ - "--will-cite" - "-j $NIX_BUILD_CORES" - "${lib.getExe brotli.package} --keep --quality=${builtins.toString brotli.compressionLevel} --output={}.br {}" - ]} + find ${appDir}/public -type f ${findTextFileNames} -print0 \ + | xargs -0 -n 1 -P $NIX_BUILD_CORES ${pkgs.writeShellScript "movim_precompress_broti" '' + file="$1" + ${lib.getExe brotli.package} --keep --quality=${builtins.toString brotli.compressionLevel} --output=$file.br $file + ''} echo " done." '') (lib.optionalString gzip.enable '' echo -n "Precompressing static files with Gzip …" - find ${appDir}/public -type f ${findTextFileNames} \ - | ${lib.getExe pkgs.parallel} ${lib.escapeShellArgs [ - "--will-cite" - "-j $NIX_BUILD_CORES" - "${lib.getExe gzip.package} -c -${builtins.toString gzip.compressionLevel} {} > {}.gz" - ]} + find ${appDir}/public -type f ${findTextFileNames} -print0 \ + | xargs -0 -n 1 -P $NIX_BUILD_CORES ${pkgs.writeShellScript "movim_precompress_broti" '' + file="$1" + ${lib.getExe gzip.package} -c -${builtins.toString gzip.compressionLevel} $file > $file.gz + ''} echo " done." '') ]; diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix index d6643e0c7d3a..20dd5165d26e 100644 --- a/pkgs/by-name/mo/movim/package.nix +++ b/pkgs/by-name/mo/movim/package.nix @@ -1,13 +1,13 @@ { lib , fetchpatch , fetchFromGitHub +, writeShellScript , dash , php , phpCfg ? null , withPgsql ? true # “strongly recommended” according to docs , withMysql ? false , minifyStaticFiles ? false # default files are often not minified -, parallel , esbuild , lightningcss , scour @@ -67,8 +67,7 @@ php.buildComposerProject (finalAttrs: { }); nativeBuildInputs = - lib.optional (lib.any (x: x.enable) (lib.attrValues minify)) parallel - ++ lib.optional minify.script.enable esbuild + lib.optional minify.script.enable esbuild ++ lib.optional minify.style.enable lightningcss ++ lib.optional minify.svg.enable scour; @@ -101,39 +100,30 @@ php.buildComposerProject (finalAttrs: { ''; preBuild = lib.optionalString minify.script.enable '' - find ./public -type f -iname "*.js" \ - | parallel ${lib.escapeShellArgs [ - "--will-cite" - "-j $NIX_BUILD_CORES" - '' - tmp="$(mktemp)" - esbuild {} --minify --target=${lib.escapeShellArg minify.script.target} --outfile=$tmp - [[ "$(stat -c %s $tmp)" -lt "$(stat -c %s {})" ]] && mv $tmp {} - '' - ]} + find ./public -type f -iname "*.js" -print0 \ + | xargs -0 -n 1 -P $NIX_BUILD_CORES ${writeShellScript "movim_script_minify" '' + file="$1" + tmp="$(mktemp)" + esbuild $file --minify --target=${lib.escapeShellArg minify.script.target} --outfile=$tmp + [[ "$(stat -c %s $tmp)" -lt "$(stat -c %s $file)" ]] && mv $tmp $file + ''} '' + lib.optionalString minify.style.enable '' - export BROWSERLIST=${lib.escapeShellArg minify.style.browserslist} - find ./public -type f -iname "*.css" \ - | parallel ${lib.escapeShellArgs [ - "--will-cite" - "-j $NIX_BUILD_CORES" - '' - tmp="$(mktemp)" - lightningcss {} --minify --browserslist --output-file=$tmp - [[ "$(stat -c %s $tmp)" -lt "$(stat -c %s {})" ]] && mv $tmp {} - '' - ]} + find ./public -type f -iname "*.css" -print0 \ + | xargs -0 -n 1 -P $NIX_BUILD_CORES ${writeShellScript "movim_style_minify" '' + export BROWSERLIST="${lib.escapeShellArg minify.style.browserslist}" + file="$1" + tmp="$(mktemp)" + lightningcss $file --minify --browserslist --output-file=$tmp + [[ "$(stat -c %s $tmp)" -lt "$(stat -c %s $file)" ]] && mv $tmp $file + ''} '' + lib.optionalString minify.svg.enable '' - find ./public -type f -iname "*.svg" -a -not -path "*/emojis/*" \ - | parallel ${lib.escapeShellArgs [ - "--will-cite" - "-j $NIX_BUILD_CORES" - '' - tmp="$(mktemp)" - scour -i {} -o $tmp --disable-style-to-xml --enable-comment-stripping --enable-viewboxing --indent=tab - [[ "$(stat -c %s $tmp)" -lt "$(stat -c %s {})" ]] && mv $tmp {} - '' - ]} + find ./public -type f -iname "*.svg" -a -not -path "*/emojis/*" -print0 \ + | xargs -0 -n 1 -P $NIX_BUILD_CORES ${writeShellScript "movim_svg_minify" '' + file="$1" + tmp="$(mktemp)" + scour -i $file -o $tmp --disable-style-to-xml --enable-comment-stripping --enable-viewboxing --indent=tab + [[ "$(stat -c %s $tmp)" -lt "$(stat -c %s $file)" ]] && mv $tmp $file + ''} ''; postInstall = '' From 709442b1b26b495f2a80b1075aa6027aaf985f69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 25 Apr 2024 18:44:06 -0300 Subject: [PATCH 34/73] labwc-tweaks: unstable-2024-04-02 -> 0-unstable-2024-04-27 - update version - upstream migrated to qt --- pkgs/by-name/la/labwc-tweaks/package.nix | 32 +++++++++++------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/la/labwc-tweaks/package.nix b/pkgs/by-name/la/labwc-tweaks/package.nix index fee334974a27..c79b59846903 100644 --- a/pkgs/by-name/la/labwc-tweaks/package.nix +++ b/pkgs/by-name/la/labwc-tweaks/package.nix @@ -1,44 +1,42 @@ { lib , stdenv , fetchFromGitHub -, meson -, ninja +, cmake +, perl , pkg-config -, gtk3 -, libxml2 +, qt6 , xkeyboard_config -, wrapGAppsHook , unstableGitUpdater }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "labwc-tweaks"; - version = "unstable-2024-04-02"; + version = "0-unstable-2024-04-27"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc-tweaks"; - rev = "a1a3cfaefd1908de8752d0d6d6b7170b04ee075c"; - hash = "sha256-uvUsoqiQBuNMBQWAxl/tCIvWsEYmZ4dQ31TrznI/XcA="; + rev = "9007079640e0f38c1d69ac94899229354a5c67b2"; + hash = "sha256-klKPHAhJ6fedFojXPfesjs1dG5NJhBZkzynhka5vD8M="; }; nativeBuildInputs = [ - meson - ninja + cmake + perl pkg-config - wrapGAppsHook + qt6.qttools + qt6.wrapQtAppsHook ]; buildInputs = [ - gtk3 - libxml2 + qt6.qtbase + qt6.qtwayland ]; strictDeps = true; postPatch = '' - substituteInPlace stack-lang.c --replace /usr/share/X11/xkb ${xkeyboard_config}/share/X11/xkb - substituteInPlace theme.c --replace /usr/share /run/current-system/sw/share + substituteInPlace tweaks-qt/gen-layout-list --replace-fail /usr/share/X11/xkb ${xkeyboard_config}/share/X11/xkb ''; passthru.updateScript = unstableGitUpdater { }; @@ -51,4 +49,4 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ AndersonTorres romildo ]; }; -}) +} From 3f03d0a43c0857c6b3b7f45777df9441d204f573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 28 Apr 2024 08:00:53 -0300 Subject: [PATCH 35/73] labwc-tweaks-gtk: init at 0-unstable-2024-04-07 --- pkgs/by-name/la/labwc-tweaks-gtk/package.nix | 54 ++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 pkgs/by-name/la/labwc-tweaks-gtk/package.nix diff --git a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix new file mode 100644 index 000000000000..84c71665ea9c --- /dev/null +++ b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, gtk3 +, libxml2 +, xkeyboard_config +, wrapGAppsHook +, unstableGitUpdater +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "labwc-tweaks-gtk"; + version = "0-unstable-2024-04-07"; + + src = fetchFromGitHub { + owner = "labwc"; + repo = "labwc-tweaks-gtk"; + rev = "67adbedd610a1b44e7ba667ae72a5c9b07105119"; + hash = "sha256-RGPm+hvyTWxkd3z841Y8ozXrDD1ZgHCZjimyRdRNrCs="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + libxml2 + ]; + + strictDeps = true; + + postPatch = '' + substituteInPlace stack-lang.c --replace /usr/share/X11/xkb ${xkeyboard_config}/share/X11/xkb + substituteInPlace theme.c --replace /usr/share /run/current-system/sw/share + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + homepage = "https://github.com/labwc/labwc-tweaks-gtk"; + description = "Configuration gui app for labwc; gtk fork"; + mainProgram = "labwc-tweaks"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ AndersonTorres romildo ]; + }; +}) From d04e207c02a2ff4d0c3f848ff06d321955de9f02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Apr 2024 15:02:59 +0000 Subject: [PATCH 36/73] tui-journal: 0.8.2 -> 0.8.3 --- pkgs/applications/misc/tui-journal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/tui-journal/default.nix b/pkgs/applications/misc/tui-journal/default.nix index 639c46b9bd37..555af71d3725 100644 --- a/pkgs/applications/misc/tui-journal/default.nix +++ b/pkgs/applications/misc/tui-journal/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "tui-journal"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "AmmarAbouZor"; repo = "tui-journal"; rev = "v${version}"; - hash = "sha256-qHNB+jRLQoiHPuTblpCHg2+6e5j8W6YPsuygRlTidtE="; + hash = "sha256-G8p1eaHebUH2lFNyC2njUzZacE6rayApCb7PBFcpKLk="; }; - cargoHash = "sha256-T+fXSca1u9+c305yuKOF+soxnSZ1YbBs57wco5TLpQw="; + cargoHash = "sha256-iM5PsgCUxBbjeWGEIohZwMiCIdXqj/bhFoL0GtVKKq4="; nativeBuildInputs = [ pkg-config From c7a2a23394ba6bf235e9f2604597fb7f64bfb794 Mon Sep 17 00:00:00 2001 From: vytskalt Date: Sun, 28 Apr 2024 18:50:39 +0300 Subject: [PATCH 37/73] python3Packages.tokenizers: fix cross build --- pkgs/development/python-modules/tokenizers/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index 057190bda983..92d55ef4a235 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -4,6 +4,7 @@ , buildPythonPackage , cargo , datasets +, huggingface-hub , fetchFromGitHub , fetchurl , libiconv @@ -11,6 +12,7 @@ , openssl , pkg-config , pytestCheckHook +, python , pythonOlder , requests , rustPlatform @@ -80,6 +82,7 @@ buildPythonPackage rec { }; sourceRoot = "${src.name}/bindings/python"; + maturinBuildFlags = [ "--interpreter ${python.executable}" ]; nativeBuildInputs = [ pkg-config @@ -105,6 +108,7 @@ buildPythonPackage rec { dependencies = [ numpy + huggingface-hub ]; nativeCheckInputs = [ From 821edfeb601967f74e5971448ed559485c48bac6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Apr 2024 18:14:33 +0000 Subject: [PATCH 38/73] cargo-deny: 0.14.21 -> 0.14.22 --- pkgs/development/tools/rust/cargo-deny/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 421559b347be..ad3827bc7494 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.14.21"; + version = "0.14.22"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-deny"; rev = version; - hash = "sha256-d5qgljNuEfh9kYQU+jP4tgyly6i7hETFC5tEY67Yq8g="; + hash = "sha256-04CRMlH31MzYpE2pRUrbAvSojbxan4ktqX9J/zjeTkk="; }; - cargoHash = "sha256-u1cayvVatGg03Q3xShC/0ymE8EGHyYFrZD3Q8UD8Mm8="; + cargoHash = "sha256-Nutx3Dvvh7qvgAtengWw0kJve4Ent9y7OXgovUZWTLE="; nativeBuildInputs = [ pkg-config From d6ffebb44a61482e26d1d5f28f89c1cdf82be5e2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 28 Apr 2024 20:18:48 +0200 Subject: [PATCH 39/73] weston: 13.0.0 -> 13.0.1 --- pkgs/applications/window-managers/weston/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index b4472425324e..a4e36c18368e 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "weston"; - version = "13.0.0"; + version = "13.0.1"; src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz"; - hash = "sha256-Uv8dSqI5Si5BbIWjOLYnzpf6cdQ+t2L9Sq8UXTb8eVo="; + hash = "sha256-6hVmq09f/Ofp/U96H8pbMMquTVACO/RZITmUCU4Cspo="; }; postPatch = '' From 14f2acd171fb25f0996c5b7d7d14de4b49de15ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Apr 2024 18:42:02 +0000 Subject: [PATCH 40/73] clash-verge-rev: 1.5.11 -> 1.6.0 --- pkgs/by-name/cl/clash-verge-rev/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix index 95415d03cfec..b262d0f7547e 100644 --- a/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -5,11 +5,11 @@ clash-verge.overrideAttrs (old: rec { pname = "clash-verge-rev"; - version = "1.5.11"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/clash-verge-rev/clash-verge-rev/releases/download/v${version}/clash-verge_${version}_amd64.deb"; - hash = "sha256-FoNWCH4SE7DnKoDMwdUiTnWoFwHSUCAIDQhvgZdgyeU="; + hash = "sha256-wSpWTQ+AuDG3zKocDVatRqVW5yhrOtcbNI+jfMOaXvg="; }; meta = old.meta // (with lib; { From 5071c02bb071ca7fdd9080248902f43f1817a546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 2 Apr 2024 23:33:06 +0200 Subject: [PATCH 41/73] nixos/redis: enable vmOverCommit by default as recommended by redis itself > WARNING Memory overcommit must be enabled! Without it, a background save or replication may fail under low memory condition. > Being disabled, it can also cause failures without low memory condition, see https://github.com/jemalloc/jemalloc/issues/1328. > To fix this issue add 'vm.overcommit_memory = 1' to /etc/sysctl.conf and then reboot or run the command 'sysctl vm.overcommit_memory=1' for this to take effect. --- nixos/modules/services/databases/redis.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 1da2fa9f1160..76a1c9b7fb66 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -57,9 +57,9 @@ in { package = mkPackageOption pkgs "redis" { }; vmOverCommit = mkEnableOption '' - setting of vm.overcommit_memory to 1 + set `vm.overcommit_memory` sysctl to 1 (Suggested for Background Saving: ) - ''; + '' // { default = true; }; servers = mkOption { type = with types; attrsOf (submodule ({ config, name, ... }: { From 5f349abc7bb21ee5528acd27fc0667c9b3f7f813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 2 Apr 2024 23:53:20 +0200 Subject: [PATCH 42/73] nixos/redis: don't disable transparent hugepages Since https://github.com/redis/redis/pull/4001 included in 6.2.0 transparent hugepages works when being set to madvise which is the NixOS and upstream recommended default. --- nixos/modules/services/databases/redis.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 76a1c9b7fb66..ad88a4f589a2 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -312,10 +312,9 @@ in { ''; }) enabledServers); - boot.kernel.sysctl = mkMerge [ - { "vm.nr_hugepages" = "0"; } - ( mkIf cfg.vmOverCommit { "vm.overcommit_memory" = "1"; } ) - ]; + boot.kernel.sysctl = mkIf cfg.vmOverCommit { + "vm.overcommit_memory" = "1"; + }; networking.firewall.allowedTCPPorts = concatMap (conf: optional conf.openFirewall conf.port From 5b88059fe508c4606d0af7619f0face747a45435 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 3 Apr 2024 15:45:54 +0200 Subject: [PATCH 43/73] nixos/release-notes: add redis vmOverCommit entry --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index d83e7c4ff71c..08f1d8cdac75 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -293,6 +293,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `network-interfaces.target` system target was removed as it has been deprecated for a long time. Use `network.target` instead. +- `services.redis.vmOverCommit` now defaults to `true` and no longer enforces Transparent Hugepages (THP) to be disabled. Redis only works with THP configured to `madvise` which is the kernel's default. + - `azure-cli` now has extension support. For example, to install the `aks-preview` extension, use ```nix From 7feb32bc6aec633701132eccf0ead3e11b841987 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 28 Apr 2024 23:00:28 +0200 Subject: [PATCH 44/73] guacamole-server: 1.5.4 -> 1.5.5 --- pkgs/servers/guacamole-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/guacamole-server/default.nix b/pkgs/servers/guacamole-server/default.nix index 58628b48a5b8..1b9623eab22f 100644 --- a/pkgs/servers/guacamole-server/default.nix +++ b/pkgs/servers/guacamole-server/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "guacamole-server"; - version = "1.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "apache"; repo = "guacamole-server"; rev = finalAttrs.version; - hash = "sha256-Jke9Sp/T/GyamTq7lyu8JakJHqEwSrer0v1DugSg7JY="; + hash = "sha256-ZrUaoWkZ3I/LxE7csDXXeUZ92jZDhkZ1c8EQU0gI1yY="; }; NIX_CFLAGS_COMPILE = [ From 0b7b87de7284383c5d55af15956f93027b8c5b9b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Apr 2024 21:54:56 +0000 Subject: [PATCH 45/73] atac: 0.13.0 -> 0.14.0 --- pkgs/by-name/at/atac/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/at/atac/package.nix b/pkgs/by-name/at/atac/package.nix index e06530202407..69ac822d84ee 100644 --- a/pkgs/by-name/at/atac/package.nix +++ b/pkgs/by-name/at/atac/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage rec { pname = "atac"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "Julien-cpsn"; repo = "ATAC"; rev = "v${version}"; - hash = "sha256-ChX2LMRbqoKzl+QKkeervrCHr3plAQ21RzC4RqEucCA="; + hash = "sha256-d5qUleQrwWWTIEDj3VvJKpINHpc0rko18if4pv5GonU="; }; - cargoHash = "sha256-nYkXL3SIjG3REE+w2vIlB04FWs7e0d4iu0hRjAPz7aU="; + cargoHash = "sha256-vlrllbcf5Y9DFwdekAHE5xtGlloKxTExXkp1LySEUK0="; nativeBuildInputs = [ pkg-config From 8610f111736e77fa7e010a3b72886887650e70fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Apr 2024 21:57:29 +0000 Subject: [PATCH 46/73] kraft: 0.8.4 -> 0.8.5 --- pkgs/applications/virtualization/kraft/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/kraft/default.nix b/pkgs/applications/virtualization/kraft/default.nix index a27d9d2b9955..43222fa6b19b 100644 --- a/pkgs/applications/virtualization/kraft/default.nix +++ b/pkgs/applications/virtualization/kraft/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kraftkit"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "unikraft"; repo = "kraftkit"; rev = "v${version}"; - hash = "sha256-Ob02OjqQGV60TE1CBe/Hr/WWiPNQ/33T1vPYPmJBr/4="; + hash = "sha256-31cgihmtBIB8U60ic5wKNyqB4a5sXZmIXxAjQI/43ro="; }; - vendorHash = "sha256-XYYGr/mJYQuiDJFRrr8GlQbotM+Sb8xaBiARjZ/UyIs="; + vendorHash = "sha256-X2E0Sy4rJhrDgPSSOTqUeMEdgq5H3DF5xjh84qlH1Ug="; ldflags = [ "-s" From 7c21d76b2208dc7f7b0d9910981ff100c61001e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Apr 2024 22:23:29 +0000 Subject: [PATCH 47/73] cockpit: 315 -> 316 --- pkgs/by-name/co/cockpit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index f9a18b8a36fc..aba4e7d2895e 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -44,13 +44,13 @@ in stdenv.mkDerivation rec { pname = "cockpit"; - version = "315"; + version = "316"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; rev = "refs/tags/${version}"; - hash = "sha256-N6MDqhYQky80r9wSiDIPusg6iOpDh4S52pf337nojyY="; + hash = "sha256-AoRdeAA+K6VhRxgAF7t2COJtovk8U9B9j8MaBwMjJgw="; fetchSubmodules = true; }; From 44658c14579e127aaa3b58c240028ad31e51713d Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 28 Apr 2024 22:58:28 +0000 Subject: [PATCH 48/73] discord: 0.0.50 -> 0.0.51 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 7211d540896b..9c94991f51f5 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,7 +2,7 @@ let versions = if stdenv.isLinux then { - stable = "0.0.50"; + stable = "0.0.51"; ptb = "0.0.80"; canary = "0.0.357"; development = "0.0.17"; @@ -17,7 +17,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-6VXdVLk7Z8NGQMiSdgBRd8NIueUktkId6BXYKNABb+4="; + hash = "sha256-w8zLeaqJXdbI67X/UDxSLQxZei5eraa/BkMZa+GDpYk="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; From 9511e7af23bbf4ad7f57f5cc5015232b007bd9b1 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 28 Apr 2024 22:58:42 +0000 Subject: [PATCH 49/73] discord-ptb: 0.0.80 -> 0.0.81 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 9c94991f51f5..dbc50d3d7548 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -3,7 +3,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.51"; - ptb = "0.0.80"; + ptb = "0.0.81"; canary = "0.0.357"; development = "0.0.17"; } else { @@ -21,7 +21,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-y/ntnHIYcY35Jszh0PrFy395eJ5dBWwLNpzHMoSZuNA="; + hash = "sha256-/kM23y4Hx/0HwIOQvd+4Y429s/6Q+coa27hgI2U3EcU="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; From ce38e7a4afebcf07cc6fffedad45e7f156f9d787 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 28 Apr 2024 22:58:56 +0000 Subject: [PATCH 50/73] discord-canary: 0.0.357 -> 0.0.369 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index dbc50d3d7548..3d48032f0756 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -4,7 +4,7 @@ let if stdenv.isLinux then { stable = "0.0.51"; ptb = "0.0.81"; - canary = "0.0.357"; + canary = "0.0.369"; development = "0.0.17"; } else { stable = "0.0.301"; @@ -25,7 +25,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-sDwC5kPzAfvQmsrq6M/GPFtUaT9pNAEB4uGI5Mn3oXs="; + hash = "sha256-Ohfp5ypvdmjr5rYR1usdVoEuVwOALRozysIjT/v75Qs="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; From 2ebc5bd3f59f64f5d0ffd21767d716e069a07ac9 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 28 Apr 2024 22:59:20 +0000 Subject: [PATCH 51/73] pkgsCross.aarch64-darwin.discord: 0.0.301 -> 0.0.302 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 3d48032f0756..bc8475b973e5 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,7 +7,7 @@ let canary = "0.0.369"; development = "0.0.17"; } else { - stable = "0.0.301"; + stable = "0.0.302"; ptb = "0.0.109"; canary = "0.0.477"; development = "0.0.39"; @@ -35,7 +35,7 @@ let x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-h7C1wCKtUGcMFUhoKVdD7Vq9TGUaXfmjlVhwmRdhqYw="; + hash = "sha256-Xt0ef+ogGlPA4ebxuAsGQKeMVDoTB58jCRcyM1fHjYE="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; From e2a67424fdbeb80a0f190c7cd8476c38f7bb4c42 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 28 Apr 2024 22:59:38 +0000 Subject: [PATCH 52/73] pkgsCross.aarch64-darwin.discord-ptb: 0.0.109 -> 0.0.110 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index bc8475b973e5..708253e82ce1 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -8,7 +8,7 @@ let development = "0.0.17"; } else { stable = "0.0.302"; - ptb = "0.0.109"; + ptb = "0.0.110"; canary = "0.0.477"; development = "0.0.39"; }; @@ -39,7 +39,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-xxLnzELuI0X2r/weP1K2Bb51uRh1JjR72p7cXzy12Kc="; + hash = "sha256-hkRO/4YD1j4gsp+r3+md3ND/xtNmdutJiXlY3UIecIY="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; From 5c88cde0ba69605ce17fb99fc80b21d12c812eda Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 28 Apr 2024 23:00:40 +0000 Subject: [PATCH 53/73] pkgsCross.aarch64-darwin.discord-canary: 0.0.477 -> 0.0.486 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 708253e82ce1..31c26bd4e683 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -9,7 +9,7 @@ let } else { stable = "0.0.302"; ptb = "0.0.110"; - canary = "0.0.477"; + canary = "0.0.486"; development = "0.0.39"; }; version = versions.${branch}; @@ -43,7 +43,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-xEDtEtZNhOTtz+zRLLQBSeLbntlVAVQsocAGyAaVePM="; + hash = "sha256-c7KNWsV+pultD+HqRNonSOW9PCGx1AajCfnc94Dokwc="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; From 79aa1b2182a1e4cd4301f8b5271935e5d756c806 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 29 Apr 2024 02:24:09 +0300 Subject: [PATCH 54/73] maintainers: retire inactive `MP2E` their last commit to nixpkgs was in `2019-02-21` --- maintainers/maintainer-list.nix | 6 ------ maintainers/team-list.nix | 1 - pkgs/applications/emulators/dolphin-emu/default.nix | 1 - pkgs/applications/emulators/dolphin-emu/primehack.nix | 2 +- .../networking/instant-messengers/discord/default.nix | 2 +- pkgs/applications/video/obs-studio/default.nix | 2 +- pkgs/development/libraries/SDL2_mixer/default.nix | 2 +- pkgs/development/libraries/SDL2_net/default.nix | 2 +- pkgs/games/doom-ports/chocolate-doom/default.nix | 2 +- pkgs/games/doom-ports/dhewm3/default.nix | 2 +- pkgs/games/doom-ports/doomseeker/default.nix | 2 +- pkgs/games/doom-ports/eternity-engine/default.nix | 2 +- pkgs/games/doom-ports/odamex/default.nix | 2 +- pkgs/games/doom-ports/zandronum/alpha/default.nix | 2 +- pkgs/games/doom-ports/zandronum/default.nix | 2 +- pkgs/os-specific/linux/mwprocapture/default.nix | 2 +- 16 files changed, 13 insertions(+), 21 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 36716ae1f460..f6550c2c92e2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13576,12 +13576,6 @@ githubId = 20026143; name = "Katona László"; }; - MP2E = { - email = "MP2E@archlinux.us"; - github = "MP2E"; - githubId = 167708; - name = "Cray Elliott"; - }; mpcsh = { email = "m@mpc.sh"; github = "mpcsh"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index ff096943d76b..08aa297a7c10 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -524,7 +524,6 @@ with lib.maintainers; { members = [ aanderse edwtjo - MP2E thiagokokada ]; scope = "Maintain Libretro, RetroArch and related packages."; diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index 3f77dcd105f9..568f43d3564c 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -202,7 +202,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ - MP2E ashkitten ivar ]; diff --git a/pkgs/applications/emulators/dolphin-emu/primehack.nix b/pkgs/applications/emulators/dolphin-emu/primehack.nix index 7c409692d939..b4698480a962 100644 --- a/pkgs/applications/emulators/dolphin-emu/primehack.nix +++ b/pkgs/applications/emulators/dolphin-emu/primehack.nix @@ -143,7 +143,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/shiiion/dolphin"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ MP2E ashkitten Madouura ]; + maintainers = with maintainers; [ ashkitten Madouura ]; broken = stdenv.isDarwin; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 7211d540896b..4b0d9e1d35ee 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -60,7 +60,7 @@ let downloadPage = "https://discordapp.com/download"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ MP2E Scrumplex artturin infinidoge jopejoe1 ]; + maintainers = with maintainers; [ Scrumplex artturin infinidoge jopejoe1 ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "discord"; }; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 3df52d08684d..f278d832958e 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -198,7 +198,7 @@ stdenv.mkDerivation (finalAttrs: { video content, efficiently ''; homepage = "https://obsproject.com"; - maintainers = with maintainers; [ eclairevoyant jb55 MP2E materus fpletz ]; + maintainers = with maintainers; [ eclairevoyant jb55 materus fpletz ]; license = with licenses; [ gpl2Plus ] ++ optional withFdk fraunhofer-fdk; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; mainProgram = "obs"; diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index 70d080e57ab8..d9e8d7e774a7 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { description = "SDL multi-channel audio mixer library"; platforms = platforms.unix; homepage = "https://github.com/libsdl-org/SDL_mixer"; - maintainers = with maintainers; [ MP2E ]; + maintainers = with maintainers; [ ]; license = licenses.zlib; }; } diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix index b07d860cf0c3..1640c5e3b86b 100644 --- a/pkgs/development/libraries/SDL2_net/default.nix +++ b/pkgs/development/libraries/SDL2_net/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "SDL multiplatform networking library"; homepage = "https://www.libsdl.org/projects/SDL_net"; license = licenses.zlib; - maintainers = with maintainers; [ MP2E ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/games/doom-ports/chocolate-doom/default.nix b/pkgs/games/doom-ports/chocolate-doom/default.nix index 30fe2010b022..4bd3944a4224 100644 --- a/pkgs/games/doom-ports/chocolate-doom/default.nix +++ b/pkgs/games/doom-ports/chocolate-doom/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; hydraPlatforms = lib.platforms.linux; # darwin times out - maintainers = with lib.maintainers; [ MP2E ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/games/doom-ports/dhewm3/default.nix b/pkgs/games/doom-ports/dhewm3/default.nix index 9a187c76820d..19cf87110caa 100644 --- a/pkgs/games/doom-ports/dhewm3/default.nix +++ b/pkgs/games/doom-ports/dhewm3/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { description = "Doom 3 port to SDL"; mainProgram = "dhewm3"; license = lib.licenses.gpl3; - maintainers = with maintainers; [ MP2E ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; }; } diff --git a/pkgs/games/doom-ports/doomseeker/default.nix b/pkgs/games/doom-ports/doomseeker/default.nix index c3d3db1d254a..11aec59bf4db 100644 --- a/pkgs/games/doom-ports/doomseeker/default.nix +++ b/pkgs/games/doom-ports/doomseeker/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { mainProgram = "doomseeker"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = [ maintainers.MP2E ]; + maintainers = [ ]; }; } diff --git a/pkgs/games/doom-ports/eternity-engine/default.nix b/pkgs/games/doom-ports/eternity-engine/default.nix index 7afef923e08b..5239cae4d8cc 100644 --- a/pkgs/games/doom-ports/eternity-engine/default.nix +++ b/pkgs/games/doom-ports/eternity-engine/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { mainProgram = "eternity"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ MP2E ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/games/doom-ports/odamex/default.nix b/pkgs/games/doom-ports/odamex/default.nix index 5fc1b57be5dc..cc1862b0b371 100644 --- a/pkgs/games/doom-ports/odamex/default.nix +++ b/pkgs/games/doom-ports/odamex/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { description = "A client/server port for playing old-school Doom online"; license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ MP2E ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/games/doom-ports/zandronum/alpha/default.nix b/pkgs/games/doom-ports/zandronum/alpha/default.nix index c5d883fcb556..665bef3bd4a1 100644 --- a/pkgs/games/doom-ports/zandronum/alpha/default.nix +++ b/pkgs/games/doom-ports/zandronum/alpha/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://zandronum.com/"; description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software"; - maintainers = with maintainers; [ lassulus MP2E ]; + maintainers = with maintainers; [ lassulus ]; license = licenses.sleepycat; platforms = platforms.linux; }; diff --git a/pkgs/games/doom-ports/zandronum/default.nix b/pkgs/games/doom-ports/zandronum/default.nix index c8e1927aafed..17c9b473870a 100644 --- a/pkgs/games/doom-ports/zandronum/default.nix +++ b/pkgs/games/doom-ports/zandronum/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { homepage = "https://zandronum.com/"; description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software"; mainProgram = "zandronum-server"; - maintainers = with maintainers; [ lassulus MP2E ]; + maintainers = with maintainers; [ lassulus ]; license = licenses.sleepycat; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index 2b4628762f10..711a14845df7 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { homepage = "https://www.magewell.com/"; description = "Linux driver for the Magewell Pro Capture family"; license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ flexiondotorg MP2E ]; + maintainers = with maintainers; [ flexiondotorg ]; platforms = platforms.linux; }; } From 5ccd11ee4faa6827edeeb64ce1170fc657d443ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Apr 2024 00:45:20 +0000 Subject: [PATCH 55/73] home-manager: unstable-2024-04-23 -> 0-unstable-2024-04-29 --- pkgs/by-name/ho/home-manager/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index 1347b1fe93fb..eab2ca256876 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -16,14 +16,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "unstable-2024-04-23"; + version = "0-unstable-2024-04-29"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "33a20182e3164f451b6a4ac2ecadcab5c2c36703"; - hash = "sha256-pHJYZIVFmzPAwyTfcMGJwlfz18nOsS4p0CuDnI1EDL4="; + rev = "9fe79591c1005ce6f93084ae7f7dab0a2891440d"; + hash = "sha256-OzD1P0o46uD3Ix4ZI/g9z3YAeg+4g+W3qctB6bNOReo="; }; nativeBuildInputs = [ From 26403a22a372cb118d4a2a2d5a5ec1db36de43bf Mon Sep 17 00:00:00 2001 From: Ross Light Date: Sun, 28 Apr 2024 18:02:02 -0700 Subject: [PATCH 56/73] Remove zombiezen from maintainers --- maintainers/maintainer-list.nix | 6 ------ pkgs/applications/version-management/gg/default.nix | 1 - pkgs/tools/networking/ghz/default.nix | 1 - 3 files changed, 8 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 36716ae1f460..65c937138105 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -22471,12 +22471,6 @@ githubId = 51886259; name = "Zokre Zyl"; }; - zombiezen = { - name = "Ross Light"; - email = "ross@zombiezen.com"; - github = "zombiezen"; - githubId = 181535; - }; zookatron = { email = "tim@zookatron.com"; github = "zookatron"; diff --git a/pkgs/applications/version-management/gg/default.nix b/pkgs/applications/version-management/gg/default.nix index 279e6d0075e7..89fd45e45f0d 100644 --- a/pkgs/applications/version-management/gg/default.nix +++ b/pkgs/applications/version-management/gg/default.nix @@ -59,6 +59,5 @@ in buildGoModule { homepage = "https://gg-scm.io/"; changelog = "https://github.com/gg-scm/gg/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ zombiezen ]; }; } diff --git a/pkgs/tools/networking/ghz/default.nix b/pkgs/tools/networking/ghz/default.nix index 89253f3fe489..eb20a398e419 100644 --- a/pkgs/tools/networking/ghz/default.nix +++ b/pkgs/tools/networking/ghz/default.nix @@ -35,6 +35,5 @@ buildGoModule rec { description = "Simple gRPC benchmarking and load testing tool"; homepage = "https://ghz.sh"; license = licenses.asl20; - maintainers = [ maintainers.zombiezen ]; }; } From 6d051c4cb52ac2d5e4c0c7d7b5447f58d212d12d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Apr 2024 02:09:44 +0000 Subject: [PATCH 57/73] discordchatexporter-cli: 2.42.8 -> 2.43 --- .../di/discordchatexporter-cli/deps.nix | 23 +++++++++---------- .../di/discordchatexporter-cli/package.nix | 4 ++-- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/di/discordchatexporter-cli/deps.nix b/pkgs/by-name/di/discordchatexporter-cli/deps.nix index c75966de85c3..46c8ca068279 100644 --- a/pkgs/by-name/di/discordchatexporter-cli/deps.nix +++ b/pkgs/by-name/di/discordchatexporter-cli/deps.nix @@ -2,22 +2,21 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "AdvancedStringBuilder"; version = "0.1.0"; sha256 = "1lpv5sggdxza0bmcqmzf5r4i340f0m7nr5073lac18naj5697q5g"; }) - (fetchNuGet { pname = "AngleSharp"; version = "1.0.7"; sha256 = "1f0sb4jknw7f9mhg4f5khk1q257mn97b9qyy017jjljhqyxp449f"; }) - (fetchNuGet { pname = "AsyncKeyedLock"; version = "6.2.4"; sha256 = "1sizwdkj7ysk7nvdrnnnvl67r4smyq45k6ih4si38kxm27sqwhjw"; }) + (fetchNuGet { pname = "AdvancedStringBuilder"; version = "0.1.1"; sha256 = "1qc5b9vlh42yyw00kppkrdz0cji0cxslh97794km9nid8wcv3f54"; }) + (fetchNuGet { pname = "AngleSharp"; version = "1.1.2"; sha256 = "0rfild46lmqhxkfh6nhy7a9m8zzv25lj29riav5j6dmzw07l7wif"; }) + (fetchNuGet { pname = "AsyncKeyedLock"; version = "6.4.2"; sha256 = "1pghspgz9xis139b5v8h2y40gp14x6qfcam27zawq6cp278gnjhi"; }) (fetchNuGet { pname = "CliFx"; version = "2.3.5"; sha256 = "0rlbv93ssw0d8kvhnvrz2f06ka66gz4gbz1va2q135dab99cmrin"; }) - (fetchNuGet { pname = "CSharpier.MsBuild"; version = "0.26.7"; sha256 = "1pa96gci9nwav1g93vxq4mc0h1bjasax9j6giya1ms6rdmqxxlyn"; }) + (fetchNuGet { pname = "CSharpier.MsBuild"; version = "0.28.2"; sha256 = "10c3v3pqv49y5wi0slswfzkwjh9q93diihpmkbfp3r7yjpv6871d"; }) (fetchNuGet { pname = "Deorcify"; version = "1.0.2"; sha256 = "0nwxyrl4rd5x621i2hs5fl3w7fxpm13lkdssxr9fd5042px2gqbm"; }) - (fetchNuGet { pname = "DotnetRuntimeBootstrapper"; version = "2.5.2"; sha256 = "0j3z9wdhn6d4np0cjxv2wb5n9blm9frgbxs1p6zdafbxr98qzb73"; }) + (fetchNuGet { pname = "DotnetRuntimeBootstrapper"; version = "2.5.4"; sha256 = "0pjzyvq0a975m0y7b0k8wsr7mskykv3bzba98xmcc29nsyib2a8h"; }) (fetchNuGet { pname = "Gress"; version = "2.1.1"; sha256 = "1svz1flhyl26h3xjch0acjjinympgf6bhj5vpb188njfih3ip4ck"; }) (fetchNuGet { pname = "JsonExtensions"; version = "1.2.0"; sha256 = "0g54hibabbqqfhxjlnxwv1rxagpali5agvnpymp2w3dk8h6q66xy"; }) - (fetchNuGet { pname = "Polly"; version = "8.2.0"; sha256 = "0gxdi4sf60vpxsb258v592ykkq9a3dq2awayp99yy9djys8bglks"; }) - (fetchNuGet { pname = "Polly.Core"; version = "8.2.0"; sha256 = "00b4jbyiyslqvswy4j2lfw0rl0gq8m4v5fj2asb96i6l224bs7d3"; }) - (fetchNuGet { pname = "RazorBlade"; version = "0.5.0"; sha256 = "11s68yqvpp65yam954f281vw9pmb2c5mxnk0n5j6xv1xylng4x5b"; }) - (fetchNuGet { pname = "Spectre.Console"; version = "0.48.0"; sha256 = "0v3zijim9k5lcmhn0ajlsix0japvx3c20r9b7x7f7gvraa8w3gl6"; }) + (fetchNuGet { pname = "Polly"; version = "8.3.1"; sha256 = "19q7s493sv90879052pxfcbsk3bmxjg5688ya7l12964ddafiwsl"; }) + (fetchNuGet { pname = "Polly.Core"; version = "8.3.1"; sha256 = "15ylkqdcwpr76n0nfzpvd6s00ywjagn1ignyrcz9arwahrxpsm4b"; }) + (fetchNuGet { pname = "RazorBlade"; version = "0.6.0"; sha256 = "11k2j7d7ddb47sj4lkply8v4aqrfxl0b314cv0l4f5syi4ilfa6s"; }) + (fetchNuGet { pname = "Spectre.Console"; version = "0.49.1"; sha256 = "0fhl96p3xjd5k1wwvhs80cp35rrlgnza6mw9vy0knhmf7ji9b95n"; }) (fetchNuGet { pname = "Superpower"; version = "3.0.0"; sha256 = "0p6riay4732j1fahc081dzgs9q4z3n2fpxrin4zfpj6q2226dhz4"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; sha256 = "1lgdd78cik4qyvp2fggaa0kzxasw6kc9a6cjqw46siagrm0qnc3y"; }) - (fetchNuGet { pname = "WebMarkupMin.Core"; version = "2.14.0"; sha256 = "0c41zw1bwz6ybxagq5vr26cx7najd17rrdbqjpn8mabynq380ayr"; }) - (fetchNuGet { pname = "YoutubeExplode"; version = "6.3.10"; sha256 = "0b3n8mfxa4l7bfk0c1s7yfw4m1kvnm2r5pqfvr6s20gjq3wzfih5"; }) + (fetchNuGet { pname = "WebMarkupMin.Core"; version = "2.16.0"; sha256 = "0cbkgrrkam76bhygrjzd4nj4mpzpgbnsddfzwry1933rcvjlqh6m"; }) + (fetchNuGet { pname = "YoutubeExplode"; version = "6.3.14"; sha256 = "12w9zz6y7cdw6p2gvr34r4qcl35hh19zn9fm0risrrcs8577msxs"; }) ] diff --git a/pkgs/by-name/di/discordchatexporter-cli/package.nix b/pkgs/by-name/di/discordchatexporter-cli/package.nix index 9f3d709fd166..ed6f4e836aa3 100644 --- a/pkgs/by-name/di/discordchatexporter-cli/package.nix +++ b/pkgs/by-name/di/discordchatexporter-cli/package.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "discordchatexporter-cli"; - version = "2.42.8"; + version = "2.43"; src = fetchFromGitHub { owner = "tyrrrz"; repo = "discordchatexporter"; rev = version; - hash = "sha256-54NTeIs0a8hd2xKQkAxwfyGwEPUlSSXXvDamGLfa9ls="; + hash = "sha256-FbZ2Kt5lKTINpj0EsJGXWY1aK0qitks16GClBWa/iQ4="; }; projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj"; From 7f0e0685a48a9e2b0899c561904891d0f778c6de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Apr 2024 02:38:07 +0000 Subject: [PATCH 58/73] workout-tracker: 0.14.1 -> 0.14.2 --- pkgs/by-name/wo/workout-tracker/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wo/workout-tracker/package.nix b/pkgs/by-name/wo/workout-tracker/package.nix index 34a031d853e9..d22ebbe3aba6 100644 --- a/pkgs/by-name/wo/workout-tracker/package.nix +++ b/pkgs/by-name/wo/workout-tracker/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "workout-tracker"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "jovandeginste"; repo = "workout-tracker"; rev = "refs/tags/v${version}"; - hash = "sha256-zmDY5KpKkq/9SYAm+v0QSnLLjxYQCzzXWLlCFkE8bA0="; + hash = "sha256-hQPBptpsxksfILZXXAVIcFf+W7Eea3pcgnndHY4mO9c="; }; vendorHash = null; From 30c644c1ee066cf4df638b978c2fd08568af4270 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Apr 2024 03:20:17 +0000 Subject: [PATCH 59/73] ocamlPackages.iri: 0.7.0 -> 1.0.0 --- pkgs/development/ocaml-modules/iri/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/iri/default.nix b/pkgs/development/ocaml-modules/iri/default.nix index 8d7b3f6893fe..54db34bc9740 100644 --- a/pkgs/development/ocaml-modules/iri/default.nix +++ b/pkgs/development/ocaml-modules/iri/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "iri"; - version = "0.7.0"; + version = "1.0.0"; minimalOCamlVersion = "4.12"; @@ -13,7 +13,7 @@ buildDunePackage rec { owner = "zoggy"; repo = "ocaml-iri"; rev = version; - hash = "sha256-Mkg7kIIVpKbeWUras1RqtJsRx2Q3dBnm4QqSMJFweF8="; + hash = "sha256-6Q7qPezmdcO6JSevWl55XAxFuIROZNDrMkYw8VRR7qg="; }; propagatedBuildInputs = [ sedlex uunf uutf ]; From f031bed2ef9da2a71420c5ff5ddc40d1369aa507 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Apr 2024 03:27:31 +0000 Subject: [PATCH 60/73] below: 0.7.1 -> 0.8.1 --- pkgs/os-specific/linux/below/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/below/default.nix b/pkgs/os-specific/linux/below/default.nix index 3204bd7dcf27..5efc80357d8f 100644 --- a/pkgs/os-specific/linux/below/default.nix +++ b/pkgs/os-specific/linux/below/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "below"; - version = "0.7.1"; + version = "0.8.1"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "below"; rev = "v${version}"; - sha256 = "sha256-2mZBpvLPY6yrEAvB1YlFuaXJlmmNuZqhu3xWADNHbx0="; + sha256 = "sha256-87Fdx3Jqi3dNWM5DZl+UYs031qn2DoiiWd3IysT/glQ="; }; - cargoHash = "sha256-cTNxWCd4YH5VuZh0GRfBNtHmLqCQ75uyHqROkv1jbRA="; + cargoHash = "sha256-y2fNypA0MrCdUI/K6QrZWw/5mkYafj2s6jrGHU2zGXw="; prePatch = ''sed -i "s,ExecStart=.*/bin,ExecStart=$out/bin," etc/below.service''; postInstall = '' From fd1009124b616aa0e3d6db2346e30f938b13655f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Apr 2024 03:32:34 +0000 Subject: [PATCH 61/73] ocamlPackages.tsdl-ttf: 0.5 -> 0.6 --- pkgs/development/ocaml-modules/tsdl-ttf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/tsdl-ttf/default.nix b/pkgs/development/ocaml-modules/tsdl-ttf/default.nix index 93bee8f10156..086b0789a6a5 100644 --- a/pkgs/development/ocaml-modules/tsdl-ttf/default.nix +++ b/pkgs/development/ocaml-modules/tsdl-ttf/default.nix @@ -9,7 +9,7 @@ buildDunePackage rec { pname = "tsdl-ttf"; - version = "0.5"; + version = "0.6"; duneVersion = "3"; @@ -17,7 +17,7 @@ buildDunePackage rec { owner = "sanette"; repo = pname; rev = version; - hash = "sha256-ai9ChsA3HZzTxT9AuHsY1UIA2Q3U3CcOA7jRSG4MDsQ="; + hash = "sha256-1MGbsekaBoCz4vAwg+Dfzsl0xUKgs8dUEr+OpLopnig="; }; buildInputs = [ From ac8162c98477f7f2396d82e5f1f2e47c432d44e2 Mon Sep 17 00:00:00 2001 From: huantian Date: Sun, 28 Apr 2024 20:40:56 -0700 Subject: [PATCH 62/73] tetrio-plus: unstable-2024-04-20 -> 0.27.2 --- pkgs/by-name/te/tetrio-desktop/package.nix | 7 ++++++- pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix | 14 ++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/te/tetrio-desktop/package.nix b/pkgs/by-name/te/tetrio-desktop/package.nix index 4d02efc2aa4f..f07299b37cc3 100644 --- a/pkgs/by-name/te/tetrio-desktop/package.nix +++ b/pkgs/by-name/te/tetrio-desktop/package.nix @@ -28,7 +28,12 @@ stdenv.mkDerivation (finalAttrs: { let tetrio-plus' = if tetrio-plus == null - then callPackage ./tetrio-plus.nix { tetrio-src = finalAttrs.src; } + then + callPackage ./tetrio-plus.nix + { + tetrio-src = finalAttrs.src; + tetrio-version = finalAttrs.version; + } else tetrio-plus; asarPath = diff --git a/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix b/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix index cc5c2f4fce9a..a9c6f6080b03 100644 --- a/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix +++ b/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix @@ -14,16 +14,17 @@ , asar , tetrio-src +, tetrio-version }: let - version = "unstable-2024-04-20"; + version = "0.27.2"; src = fetchFromGitLab { owner = "UniQMG"; repo = "tetrio-plus"; - rev = "8091b969cddbff32254eaebf8088efb63f4c519a"; - hash = "sha256-ow9DrS3jWNtTbz8Obj4l8Zdr3u9m7f9V3dYUE2H3thk="; + rev = "electron-v${version}-tetrio-v${lib.versions.major tetrio-version}"; + hash = "sha256-PvTivTt1Zuvk5gaCcQDcIBFsUf/ZG7TJYXqm0NP++Bw="; fetchSubmodules = true; # tetrio-plus uses this info for displaying its version, @@ -52,7 +53,7 @@ let sourceRoot = "${src.name}/tpsecore"; - cargoHash = "sha256-r5Qcu2u/ju0b/1PWz9tE5jNlNS3PfzS79Gm1XSKA3W4="; + cargoHash = "sha256-K9l8wQOtjf3l8gZMMdVnaNrgzVWGl62iBBcpA+ulJbw="; nativeBuildInputs = [ wasm-pack @@ -127,6 +128,11 @@ stdenv.mkDerivation (finalAttrs: { cp -r $src out/tetrioplus chmod -R u+w out/tetrioplus + # Disable the uninstall button in the tetrio-plus popup, + # as it doesn't make sense to mutably uninstall it in a nix package + substituteInPlace out/tetrioplus/desktop-manifest.js \ + --replace-fail '"show_uninstaller_button": true' '"show_uninstaller_button": false' + # We don't need the tpsecore source code bundled rm -rf out/tetrioplus/tpsecore/ # since we install the compiled version here From 4e5e98a3989265af204eac29f93e1c5012506887 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Apr 2024 03:44:33 +0000 Subject: [PATCH 63/73] the-foundation: 1.7.0 -> 1.8.1 --- pkgs/development/libraries/the-foundation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/the-foundation/default.nix b/pkgs/development/libraries/the-foundation/default.nix index 9b0fe4de9e44..d3021995ff8f 100644 --- a/pkgs/development/libraries/the-foundation/default.nix +++ b/pkgs/development/libraries/the-foundation/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "the-foundation"; - version = "1.7.0"; + version = "1.8.1"; src = fetchFromGitea { domain = "git.skyjake.fi"; owner = "skyjake"; repo = "the_Foundation"; rev = "v${finalAttrs.version}"; - hash = "sha256-6bEd8KzOfBse5sQ2zp+cZtEAu8xIl3GqrpxSZ7h/edI="; + hash = "sha256-gyDBK/bF+QxXMnthUfMjeUuRBZk0Xcahm7wOtLGs5kY="; }; nativeBuildInputs = [ cmake pkg-config ]; From cb594c8557bbd537b8802ed097ec8c912cd2fb68 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Apr 2024 06:16:53 +0000 Subject: [PATCH 64/73] gremlin-console: 3.7.1 -> 3.7.2 --- pkgs/applications/misc/gremlin-console/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix index ee7d7d3a95b9..eccb7df29166 100644 --- a/pkgs/applications/misc/gremlin-console/default.nix +++ b/pkgs/applications/misc/gremlin-console/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gremlin-console"; - version = "3.7.1"; + version = "3.7.2"; src = fetchzip { url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; - sha256 = "sha256-uiJy4kfcTFUymyE0DxP6GlMX7ONogLFrx6K9IcgwTSE="; + sha256 = "sha256-lIrqMvI/sYGu36X3jNptoIz7mPVomk8YCIR/6y8mpEc="; }; nativeBuildInputs = [ makeWrapper ]; From 35092bf19cb71ea0609f763b6d425943b0ec92c2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 22 Apr 2024 08:03:23 +0200 Subject: [PATCH 65/73] ocamlPackages.mtime_1: remove --- pkgs/development/ocaml-modules/mtime/1_x.nix | 22 -------------------- pkgs/top-level/ocaml-packages.nix | 3 +-- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/mtime/1_x.nix diff --git a/pkgs/development/ocaml-modules/mtime/1_x.nix b/pkgs/development/ocaml-modules/mtime/1_x.nix deleted file mode 100644 index e10f2b7d7a3b..000000000000 --- a/pkgs/development/ocaml-modules/mtime/1_x.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, mtime }: - -lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") - "mtime is not available for OCaml ${ocaml.version}" - -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-mtime"; - version = "1.4.0"; - - src = fetchurl { - url = "https://erratique.ch/software/mtime/releases/mtime-${version}.tbz"; - sha256 = "VQyYEk8+57Yq8SUuYossaQUHZKqemHDJtf4LK8qjxvc="; - }; - - nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; - buildInputs = [ topkg ]; - - strictDeps = true; - - inherit (topkg) buildPhase installPhase; - inherit (mtime) meta; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 932ff6505b78..b5f51c68d1d8 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1184,7 +1184,6 @@ let msat = callPackage ../development/ocaml-modules/msat { }; - mtime_1 = callPackage ../development/ocaml-modules/mtime/1_x.nix { }; mtime = callPackage ../development/ocaml-modules/mtime { }; multipart-form-data = callPackage ../development/ocaml-modules/multipart-form-data { }; @@ -1385,7 +1384,7 @@ let inherit (pkgs) unzip; }; - opium = callPackage ../development/ocaml-modules/opium { mtime = mtime_1; }; + opium = callPackage ../development/ocaml-modules/opium { }; opti = callPackage ../development/ocaml-modules/opti { }; From a6639281460e5cab3823ec6edee6471edf90c25e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Apr 2024 06:31:46 +0000 Subject: [PATCH 66/73] cargo-bloat: 0.11.1 -> 0.12.0 --- pkgs/by-name/ca/cargo-bloat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-bloat/package.nix b/pkgs/by-name/ca/cargo-bloat/package.nix index 59085534d063..b0026988c9a1 100644 --- a/pkgs/by-name/ca/cargo-bloat/package.nix +++ b/pkgs/by-name/ca/cargo-bloat/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bloat"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - hash = "sha256-lCA7C1G2xu65jn3/wzj6prWSrjQz3EqqJyMlPR/HRFs="; + hash = "sha256-vPk6ERl0VM1TjK/JRMcXqCvKqSTuw78MsmQ0xImQyd4="; }; - cargoHash = "sha256-fOenXn5gagFss9DRDXXsGxQlDqVXZ5LZcdM4WsXAyUU="; + cargoHash = "sha256-6fMFGLH16Z1O+ETlr0685TXHup1vJetfzPdNC2Lw9uM="; meta = with lib; { description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; From 1dce575c51dc33fc29e68ce8a37c9cc0c8d06653 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 28 Apr 2024 16:00:22 +0200 Subject: [PATCH 67/73] manim: 0.18.0.post0 -> 0.18.1 Changelog: https://github.com/ManimCommunity/manim/releases/tag/v0.18.1 --- pkgs/applications/video/manim/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/applications/video/manim/default.nix index 57186eec19f8..b341a7ffee89 100644 --- a/pkgs/applications/video/manim/default.nix +++ b/pkgs/applications/video/manim/default.nix @@ -47,14 +47,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "manim"; pyproject = true; - version = "0.18.0.post0"; - disabled = python3.pythonOlder "3.8"; + version = "0.18.1"; + disabled = python3.pythonOlder "3.9"; src = fetchFromGitHub { owner = "ManimCommunity"; repo = "manim"; rev = "refs/tags/v${version}"; - hash = "sha256-4HwQ74oHloK+1KOD6SzXCzGIDD+Dc0jDabw6/+cqmos="; + hash = "sha256-o+Wl3NMK6yopcsRVFtZuUE9c1GABa5d8rbQNHDJ4OiQ="; }; nativeBuildInputs = with python.pkgs; [ From d512dc8c23a4be01f3baeccc808e6822904a423f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 28 Apr 2024 16:26:47 +0200 Subject: [PATCH 68/73] python311Packages.manim-slides: 5.1.3 -> 5.1.5 Diff: https://github.com/jeertmans/manim-slides/compare/refs/tags/v5.1.3...v5.1.5 Changelog: https://github.com/jeertmans/manim-slides/blob/refs/tags/v5.1.5/CHANGELOG.md --- .../python-modules/manim-slides/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/manim-slides/default.nix b/pkgs/development/python-modules/manim-slides/default.nix index ec1811d707d7..8f89346b81b8 100644 --- a/pkgs/development/python-modules/manim-slides/default.nix +++ b/pkgs/development/python-modules/manim-slides/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , pythonOlder +, hatchling +, pythonRelaxDepsHook , manim , ffmpeg @@ -27,17 +29,13 @@ # Optional dependencies , ipython - # Hooks -, pdm-backend -, pythonRelaxDepsHook - # As Module or application? , withGui ? false }: buildPythonPackage rec { pname = "manim-slides"; - format = "pyproject"; - version = "5.1.3"; + version = "5.1.5"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -45,16 +43,19 @@ buildPythonPackage rec { owner = "jeertmans"; repo = "manim-slides"; rev = "refs/tags/v${version}"; - hash = "sha256-WZR95swapT2Fbu6mbuHLjMu3Okq/wKFabzN7xpZw0/g="; + hash = "sha256-YOveWGukizXvEUOhId7UDJema64ypbg7w06JzrTsKjw="; }; - nativeBuildInputs = [ pdm-backend pythonRelaxDepsHook ]; + build-system = [ + hatchling + pythonRelaxDepsHook + ]; pythonRemoveDeps = [ "opencv-python" ]; pythonRelaxDeps = [ "rtoml" "qtpy" ]; - propagatedBuildInputs = [ + dependencies = [ av click click-default-group From 0d8e875ccda201730cff757e5e9d0783b84e7d95 Mon Sep 17 00:00:00 2001 From: oluceps Date: Mon, 29 Apr 2024 06:53:33 +0000 Subject: [PATCH 69/73] mihomo: 1.18.3 -> 1.18.4 Diff: https://github.com/MetaCubeX/mihomo/compare/v1.18.3...v1.18.4 --- pkgs/by-name/mi/mihomo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix index 6e880a4a0c33..b397c9a3e2b0 100644 --- a/pkgs/by-name/mi/mihomo/package.nix +++ b/pkgs/by-name/mi/mihomo/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mihomo"; - version = "1.18.3"; + version = "1.18.4"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "mihomo"; rev = "v${version}"; - hash = "sha256-/fFVUI++OhOer5DrvcXO+R+4whtb5+3Qg3e4+ikJr1Y="; + hash = "sha256-mqNcMB2nb8+e9XEGKqwaBE/nC4+jRaEFxE17e0JTo8Y="; }; - vendorHash = "sha256-k4xB/jO78VGD+n9HtuoWXoXB+kZCEyPKJTTwj32nGIw="; + vendorHash = "sha256-9Ey4roUm/Y6GfFmLD6ij/A+YIgetStawWmhD+Iq3qc8="; excludedPackages = [ "./test" ]; From 86c2fc34064f9ac1c04feaed011a1c34f50ec9a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 29 Apr 2024 08:42:36 +0200 Subject: [PATCH 70/73] pwngdb: make gdbinit.py self-contained This avoids polluting child processes with PYTHONPATH (also PATH is still propagated). Also it makes it easier to load the resulting gdbinit.py in your own .gdbinit. --- pkgs/by-name/pw/pwndbg/package.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pw/pwndbg/package.nix b/pkgs/by-name/pw/pwndbg/package.nix index 2967130b7fd1..473a401ce1c5 100644 --- a/pkgs/by-name/pw/pwndbg/package.nix +++ b/pkgs/by-name/pw/pwndbg/package.nix @@ -18,7 +18,7 @@ let python3.pkgs.ropgadget # ref: https://github.com/pwndbg/pwndbg/blob/2022.12.19/pwndbg/commands/rop.py#L32 ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "pwndbg"; version = lib.getVersion pwndbg-py; format = "other"; @@ -31,20 +31,32 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/share/pwndbg - cp gdbinit.py $out/share/pwndbg + cp gdbinit.py $out/share/pwndbg/gdbinit.py chmod +x $out/share/pwndbg/gdbinit.py + # First line is a import from future, so we need to append our imports after that + sed '2 i import sys, os + 3 i [sys.path.append(p) for p in "${pythonPath}".split(":")] + 4 i os.environ["PATH"] += ":${binPath}"' -i $out/share/pwndbg/gdbinit.py # Don't require an in-package venv touch $out/share/pwndbg/.skip-venv makeWrapper ${gdb}/bin/gdb $out/bin/pwndbg \ - --add-flags "-q -x $out/share/pwndbg/gdbinit.py" \ - --prefix PATH : ${binPath} \ - --set PYTHONPATH ${pythonPath} \ + --add-flags "-q -x $out/share/pwndbg/gdbinit.py" runHook postInstall ''; + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + # Check if pwndbg is installed correctly + HOME=$TMPDIR LC_CTYPE=C.UTF-8 $out/bin/pwndbg -ex exit + + runHook postInstallCheck + ''; + meta = with lib; { description = "Exploit Development and Reverse Engineering with GDB Made Easy"; mainProgram = "pwndbg"; From debfa14c11292aac5f42df288ad6a4cb580ab7f5 Mon Sep 17 00:00:00 2001 From: Krzysztof Nazarewski Date: Mon, 29 Apr 2024 09:55:50 +0200 Subject: [PATCH 71/73] rambox: fix for binary dropping version suffix fixes https://github.com/NixOS/nixpkgs/issues/307545 --- .../networking/instant-messengers/rambox/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 53762baf82ff..af5f6ca321c0 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -17,7 +17,7 @@ let categories = [ "Network" ]; }); - appimageContents = appimageTools.extractType2 { + appimageContents = appimageTools.extract { inherit pname version src; }; in @@ -26,7 +26,6 @@ appimageTools.wrapType2 { extraInstallCommands = '' mkdir -p $out/share/applications $out/share/icons/hicolor/256x256/apps - ln -sf rambox-${version} $out/bin/${pname} install -Dm644 ${appimageContents}/usr/share/icons/hicolor/256x256/apps/rambox*.png $out/share/icons/hicolor/256x256/apps/${pname}.png install -Dm644 ${desktopItem}/share/applications/* $out/share/applications ''; From 1d9cd57ddf7cb2114c85bfe4302d8de7ed8ce5e7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 22 Apr 2024 21:40:42 +0200 Subject: [PATCH 72/73] =?UTF-8?q?why3:=201.7.1=20=E2=86=92=201.7.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/science/logic/why3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 1676ca4c2a4f..74659a58f13e 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -1,6 +1,6 @@ { callPackage, fetchurl, lib, stdenv , ocamlPackages, coqPackages, rubber, hevea, emacs -, version ? "1.7.1" +, version ? "1.7.2" , ideSupport ? true , wrapGAppsHook }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://why3.gitlabpages.inria.fr/releases/${pname}-${version}.tar.gz"; hash = { - "1.7.1" = "sha256-rG1hcxFhQ2PlE9RTz9ELliDjCuSzLnJ1togRY637cU4="; + "1.7.2" = "sha256-VaSG/FiO2MDdSSFXGJJrIylQx0LPwtT8AF7TpPVZhCQ="; "1.6.0" = "sha256-hFvM6kHScaCtcHCc6Vezl9CR7BFbiKPoTEh7kj0ZJxw="; }."${version}"; }; From 3d7b4b748266b4e5c7e11ed5e774554f828292f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Apr 2024 05:28:22 +0000 Subject: [PATCH 73/73] gpsprune: 23.2 -> 24 --- pkgs/applications/misc/gpsprune/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 293c3c5691ec..44e96cb9085a 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gpsprune"; - version = "23.2"; + version = "24"; src = fetchurl { url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "sha256-r2iw1vINWgqxoW0Zc8Sloa+wN/GUbUQfJ0e2BSP9vxM="; + sha256 = "sha256-gMwTdwYjYJt1j5MpHw6UD1wqmF7q3ikzjVSOGakIP30="; }; dontUnpack = true;