From eb333540bcd7a079de378036f06ccc37132bfe32 Mon Sep 17 00:00:00 2001 From: zimward <96021122+zimward@users.noreply.github.com> Date: Fri, 23 Aug 2024 19:55:03 +0200 Subject: [PATCH 01/93] pid-fan-controller: init at 0.1.1 --- .../by-name/pi/pid-fan-controller/package.nix | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 pkgs/by-name/pi/pid-fan-controller/package.nix diff --git a/pkgs/by-name/pi/pid-fan-controller/package.nix b/pkgs/by-name/pi/pid-fan-controller/package.nix new file mode 100644 index 000000000000..055cebe64921 --- /dev/null +++ b/pkgs/by-name/pi/pid-fan-controller/package.nix @@ -0,0 +1,29 @@ +{ + rustPlatform, + fetchFromGitHub, + lib, +}: +let + version = "0.1.1"; +in +rustPlatform.buildRustPackage { + pname = "pid-fan-controller"; + inherit version; + + src = fetchFromGitHub { + owner = "zimward"; + repo = "pid-fan-controller"; + rev = version; + hash = "sha256-ALR9Qa0AhcGyc3+7x5CEG/72+bJzhaEoIvQNL+QjldY="; + }; + cargoHash = "sha256-u1Y1k1I5gRzpDHhRJZCCtMTwAvtCaIy3uXQTvmtEx5w="; + + meta = { + description = "Service to provide closed-loop PID fan control"; + homepage = "https://github.com/zimward/pid-fan-controller"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ zimward ]; + platforms = lib.platforms.linux; + mainProgram = "pid-fan-controller"; + }; +} From 2270367e03e69c05960253cfbd7bf7bd3d0b1158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Bori?= Date: Tue, 28 Jan 2025 12:48:15 +0100 Subject: [PATCH 02/93] megabasterd: init at 8.22 --- pkgs/by-name/me/megabasterd/package.nix | 48 +++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pkgs/by-name/me/megabasterd/package.nix diff --git a/pkgs/by-name/me/megabasterd/package.nix b/pkgs/by-name/me/megabasterd/package.nix new file mode 100644 index 000000000000..573aafed22a6 --- /dev/null +++ b/pkgs/by-name/me/megabasterd/package.nix @@ -0,0 +1,48 @@ +{ + lib, + fetchFromGitHub, + jre, + makeWrapper, + maven, +}: +let + version = "8.22"; +in +maven.buildMavenPackage { + pname = "megabasterd"; + inherit version; + + src = fetchFromGitHub { + owner = "tonikelope"; + repo = "megabasterd"; + tag = "v${version}"; + hash = "sha256-dkxIbQCnOnZ3tbqijqlRhEtEJ4q1ksot5n0gJ7HvsgI="; + }; + + mvnHash = "sha256-b7+17CXmBB65fMG472FPjOvr+9nAsUurdBC/7esalCE="; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + jar_filename=MegaBasterd-${version}-jar-with-dependencies.jar + + mkdir -p $out/bin $out/share/megabasterd + install -Dm644 target/$jar_filename $out/share/megabasterd + + makeWrapper ${jre}/bin/java $out/bin/megabasterd \ + --add-flags "-jar $out/share/megabasterd/$jar_filename" + + runHook postInstall + ''; + + meta = { + description = "Yet another unofficial (and ugly) cross-platform MEGA downloader/uploader/streaming suite"; + homepage = "https://github.com/tonikelope/megabasterd"; + changelog = "https://github.com/tonikelope/megabasterd/releases"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ theobori ]; + mainProgram = "megabasterd"; + }; +} From bdd3fbac1f59a732f8bf65c20baa130747cb95c1 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Wed, 26 Feb 2025 15:42:03 +0900 Subject: [PATCH 03/93] shogihome: init at 1.22.1 --- .../shogihome/electron-builder-config.patch | 51 +++++++ pkgs/by-name/sh/shogihome/package.nix | 136 ++++++++++++++++++ 2 files changed, 187 insertions(+) create mode 100644 pkgs/by-name/sh/shogihome/electron-builder-config.patch create mode 100644 pkgs/by-name/sh/shogihome/package.nix diff --git a/pkgs/by-name/sh/shogihome/electron-builder-config.patch b/pkgs/by-name/sh/shogihome/electron-builder-config.patch new file mode 100644 index 000000000000..d06eb5ab6988 --- /dev/null +++ b/pkgs/by-name/sh/shogihome/electron-builder-config.patch @@ -0,0 +1,51 @@ +diff --git a/scripts/build.mjs b/scripts/build.mjs +index ba5c7f60..2c454446 100644 +--- a/scripts/build.mjs ++++ b/scripts/build.mjs +@@ -1,14 +1,11 @@ + /* eslint-disable no-console */ +-import * as builder from "electron-builder"; + import fs from "node:fs"; + +-const target = process.argv[2]; +- + /** + * @type {import('electron-builder').Configuration} + * @see https://www.electron.build/configuration/configuration + */ +-const config = { ++export default { + productName: "ShogiHome", + extraMetadata: { + main: "dist/packed/background.js", +@@ -73,7 +70,7 @@ const config = { + }, + }, + linux: { +- target: "AppImage", ++ target: "dir", + fileAssociations: [ + { name: "KIF", ext: "kif" }, + { name: "KIFU", ext: "kifu" }, +@@ -85,21 +82,3 @@ const config = { + }, + publish: null, + }; +- +-switch (target) { +- case "portable": +- config.win.target = "portable"; +- break; +-} +- +-builder +- .build({ +- universal: process.platform === "darwin", +- config, +- }) +- .then((result) => { +- console.log(JSON.stringify(result)); +- }) +- .catch((error) => { +- throw error; +- }); diff --git a/pkgs/by-name/sh/shogihome/package.nix b/pkgs/by-name/sh/shogihome/package.nix new file mode 100644 index 000000000000..4a4043b67ff6 --- /dev/null +++ b/pkgs/by-name/sh/shogihome/package.nix @@ -0,0 +1,136 @@ +{ + lib, + stdenv, + buildNpmPackage, + fetchFromGitHub, + makeWrapper, + electron_35, + vulkan-loader, + makeDesktopItem, + copyDesktopItems, + commandLineArgs ? [ ], + nix-update-script, +}: + +let + electron = electron_35; +in +buildNpmPackage (finalAttrs: { + pname = "shogihome"; + version = "1.22.1"; + + src = fetchFromGitHub { + owner = "sunfish-shogi"; + repo = "shogihome"; + tag = "v${finalAttrs.version}"; + hash = "sha256-vVKdaFKOx4xm4BK+AjVr4cEDOHpOjOe58k2wUAhB9XA="; + }; + + npmDepsHash = "sha256-OS5DR+24F98ICgQ6zL4VD231Rd5JB/gJKl+qNfnP3PE="; + + patches = [ + ./electron-builder-config.patch + ]; + + postPatch = '' + substituteInPlace package.json \ + --replace-fail 'npm run install:esbuild && ' "" \ + --replace-fail 'npm run install:electron && ' "" + ''; + + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + npm_config_build_from_source = "true"; + }; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + makeWrapper + copyDesktopItems + ]; + + makeCacheWritable = true; + + dontNpmBuild = true; + + buildPhase = + '' + runHook preBuild + + cp -r ${electron.dist} electron-dist + chmod -R u+w electron-dist + '' + # Electron builder complains about symlink in electron-dist + + lib.optionalString stdenv.hostPlatform.isLinux '' + rm electron-dist/libvulkan.so.1 + cp '${lib.getLib vulkan-loader}/lib/libvulkan.so.1' electron-dist + '' + + '' + npm run electron:pack + + ./node_modules/.bin/electron-builder \ + --dir \ + --config scripts/build.mjs \ + -c.electronDist=electron-dist \ + -c.electronVersion=${electron.version} + + runHook postBuild + ''; + + installPhase = + '' + runHook preInstall + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + mkdir -p "$out/share/lib/shogihome" + cp -r dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/shogihome" + + install -Dm444 'docs/icon.svg' "$out/share/icons/hicolor/scalable/apps/shogihome.svg" + + makeWrapper '${lib.getExe electron}' "$out/bin/shogihome" \ + --add-flags "$out/share/lib/shogihome/resources/app.asar" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + --add-flags ${lib.escapeShellArgs commandLineArgs} \ + --inherit-argv0 + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p "$out/Applications" + mv dist/mac*/ShogiHome.app "$out/Applications" + '' + + '' + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "shogihome"; + exec = "shogihome %U"; + icon = "shogihome"; + desktopName = "ShogiHome"; + genericName = "Shogi Frontend"; + comment = finalAttrs.meta.description; + categories = [ "Game" ]; + startupWMClass = "ShogiHome"; + }) + ]; + + passthru = { + updateScript = nix-update-script { + extraArgs = [ + "--version-regex=^v([\\d\\.]+)$" + ]; + }; + }; + + meta = { + description = "Shogi frontend supporting USI engines"; + homepage = "https://sunfish-shogi.github.io/shogihome/"; + license = with lib.licenses; [ + mit + asl20 # for icons + ]; + maintainers = with lib.maintainers; [ + kachick + ]; + mainProgram = "shogihome"; + }; +}) From 6774047a3b39d8ffe4b4fde640c4bc201e62fbb2 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 25 Apr 2025 18:26:40 +0900 Subject: [PATCH 04/93] apery: init at 2.1.0-unstable-2024-06-23 --- pkgs/by-name/ap/apery/package.nix | 56 +++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 pkgs/by-name/ap/apery/package.nix diff --git a/pkgs/by-name/ap/apery/package.nix b/pkgs/by-name/ap/apery/package.nix new file mode 100644 index 000000000000..0a6ea700290e --- /dev/null +++ b/pkgs/by-name/ap/apery/package.nix @@ -0,0 +1,56 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + unstableGitUpdater, +}: + +rustPlatform.buildRustPackage { + pname = "apery"; + version = "2.1.0-unstable-2024-06-23"; + + src = fetchFromGitHub { + owner = "HiraokaTakuya"; + # Successor of C++ implementation + # https://github.com/HiraokaTakuya/apery/blob/d14471fc879062bfabbd181eaa91e90c7cc28a71/Readme.txt#L3-L4 + repo = "apery_rust"; + rev = "8e64bc427bff033a38f1b60b9013ad2d62f88db7"; + hash = "sha256-Y8IBZISutXNgbuc7/qhNoiwYDCP6M9ukhu48t3oZM18="; + # The submodule includes evaluation files for the installCheckPhase + fetchSubmodules = true; + }; + + cargoHash = "sha256-xaQ83WKXKSAFRSKzaTFnM2lklGLCJG+i7wa8a+KNR/I="; + + checkFlags = [ + "--skip=movegen" + ]; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + usi_command='isready + go byoyomi 1000 + wait' + usi_output="$("$out/bin/apery" <<< "$usi_command")" + [[ "$usi_output" == *'bestmove'* ]] + + runHook postInstallCheck + ''; + + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + branch = "master"; + }; + + meta = { + description = "USI shogi engine"; + homepage = "https://github.com/HiraokaTakuya/apery_rust"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + kachick + ]; + mainProgram = "apery"; + }; +} From 16ca4e3f447f53259593047297cdbb39a24bb38b Mon Sep 17 00:00:00 2001 From: zimward <96021122+zimward@users.noreply.github.com> Date: Fri, 23 Aug 2024 19:55:37 +0200 Subject: [PATCH 05/93] nixos/pid-fan-controller: init --- nixos/modules/module-list.nix | 1 + .../services/hardware/pid-fan-controller.nix | 188 ++++++++++++++++++ .../by-name/pi/pid-fan-controller/package.nix | 2 +- 3 files changed, 190 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/hardware/pid-fan-controller.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index bf9b3db4b967..851ed02519a8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -601,6 +601,7 @@ ./services/hardware/nvidia-optimus.nix ./services/hardware/openrgb.nix ./services/hardware/pcscd.nix + ./services/hardware/pid-fan-controller.nix ./services/hardware/pommed.nix ./services/hardware/power-profiles-daemon.nix ./services/hardware/rasdaemon.nix diff --git a/nixos/modules/services/hardware/pid-fan-controller.nix b/nixos/modules/services/hardware/pid-fan-controller.nix new file mode 100644 index 000000000000..a90e515868d4 --- /dev/null +++ b/nixos/modules/services/hardware/pid-fan-controller.nix @@ -0,0 +1,188 @@ +{ + lib, + config, + pkgs, + ... +}: +let + cfg = config.services.pid-fan-controller; + heatSource = { + options = { + name = lib.mkOption { + type = lib.types.uniq lib.types.nonEmptyStr; + description = "Name of the heat source."; + }; + wildcardPath = lib.mkOption { + type = lib.types.nonEmptyStr; + description = '' + Path of the heat source's `hwmon` `temp_input` file. + This path can contain multiple wildcards, but has to resolve to + exactly one result. + ''; + }; + pidParams = { + setPoint = lib.mkOption { + type = lib.types.ints.unsigned; + description = "Set point of the controller in °C."; + }; + P = lib.mkOption { + description = "K_p of PID controller."; + type = lib.types.float; + }; + I = lib.mkOption { + description = "K_i of PID controller."; + type = lib.types.float; + }; + D = lib.mkOption { + description = "K_d of PID controller."; + type = lib.types.float; + }; + }; + }; + }; + + fan = { + options = { + wildcardPath = lib.mkOption { + type = lib.types.str; + description = '' + Wildcard path of the `hwmon` `pwm` file. + If the fans are not to be found in `/sys/class/hwmon/hwmon*` the corresponding + kernel module (like `nct6775`) needs to be added to `boot.kernelModules`. + See the [`hwmon` Documentation](https://www.kernel.org/doc/html/latest/hwmon/index.html). + ''; + }; + minPwm = lib.mkOption { + default = 0; + type = lib.types.ints.u8; + description = "Minimum PWM value."; + }; + maxPwm = lib.mkOption { + default = 255; + type = lib.types.ints.u8; + description = "Maximum PWM value."; + }; + cutoff = lib.mkOption { + default = false; + type = lib.types.bool; + description = "Whether to stop the fan when `minPwm` is reached."; + }; + heatPressureSrcs = lib.mkOption { + type = lib.types.nonEmptyListOf lib.types.str; + description = "Heat pressure sources affected by the fan."; + }; + }; + }; +in +{ + options.services.pid-fan-controller = { + enable = lib.mkEnableOption "the PID fan controller, which controls the configured fans by running a closed-loop PID control loop"; + package = lib.mkPackageOption pkgs "pid-fan-controller" { }; + settings = { + interval = lib.mkOption { + default = 500; + type = lib.types.int; + description = "Interval between controller cycles in milliseconds."; + }; + heatSources = lib.mkOption { + type = lib.types.listOf (lib.types.submodule heatSource); + description = "List of heat sources to be monitored."; + example = '' + [ + { + name = "cpu"; + wildcardPath = "/sys/devices/pci0000:00/0000:00:18.3/hwmon/hwmon*/temp1_input"; + pidParams = { + setPoint = 60; + P = -5.0e-3; + I = -2.0e-3; + D = -6.0e-3; + }; + } + ]; + ''; + }; + fans = lib.mkOption { + type = lib.types.listOf (lib.types.submodule fan); + description = "List of fans to be controlled."; + example = '' + [ + { + wildcardPath = "/sys/devices/platform/nct6775.2592/hwmon/hwmon*/pwm1"; + minPwm = 60; + maxPwm = 255; + heatPressureSrcs = [ + "cpu" + "gpu" + ]; + } + ]; + ''; + }; + }; + }; + config = lib.mkIf cfg.enable { + #map camel cased attrs into snake case for config + environment.etc."pid-fan-settings.json".text = builtins.toJSON { + interval = cfg.settings.interval; + heat_srcs = map (heatSrc: { + name = heatSrc.name; + wildcard_path = heatSrc.wildcardPath; + PID_params = { + set_point = heatSrc.pidParams.setPoint; + P = heatSrc.pidParams.P; + I = heatSrc.pidParams.I; + D = heatSrc.pidParams.D; + }; + }) cfg.settings.heatSources; + fans = map (fan: { + wildcard_path = fan.wildcardPath; + min_pwm = fan.minPwm; + max_pwm = fan.maxPwm; + cutoff = fan.cutoff; + heat_pressure_srcs = fan.heatPressureSrcs; + }) cfg.settings.fans; + }; + + systemd.services.pid-fan-controller = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "simple"; + ExecStart = [ (lib.getExe cfg.package) ]; + ExecStopPost = [ "${lib.getExe cfg.package} disable" ]; + Restart = "always"; + #This service needs to run as root to write to /sys. + #therefore it should operate with the least amount of privileges needed + ProtectHome = "yes"; + #strict is not possible as it needs /sys + ProtectSystem = "full"; + ProtectProc = "invisible"; + PrivateNetwork = "yes"; + NoNewPrivileges = "yes"; + MemoryDenyWriteExecute = "yes"; + RestrictNamespaces = "~user pid net uts mnt"; + ProtectKernelModules = "yes"; + RestrictRealtime = "yes"; + SystemCallFilter = "@system-service"; + CapabilityBoundingSet = "~CAP_KILL CAP_WAKE_ALARM CAP_IPC_LOC CAP_BPF CAP_LINUX_IMMUTABLE CAP_BLOCK_SUSPEND CAP_MKNOD"; + }; + # restart unit if config changed + restartTriggers = [ config.environment.etc."pid-fan-settings.json".source ]; + }; + #sleep hook to restart the service as it breaks otherwise + systemd.services.pid-fan-controller-sleep = { + before = [ "sleep.target" ]; + wantedBy = [ "sleep.target" ]; + unitConfig = { + StopWhenUnneeded = "yes"; + }; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = [ "systemctl stop pid-fan-controller.service" ]; + ExecStop = [ "systemctl restart pid-fan-controller.service" ]; + }; + }; + }; + meta.maintainers = with lib.maintainers; [ zimward ]; +} diff --git a/pkgs/by-name/pi/pid-fan-controller/package.nix b/pkgs/by-name/pi/pid-fan-controller/package.nix index 055cebe64921..12cfdc626b57 100644 --- a/pkgs/by-name/pi/pid-fan-controller/package.nix +++ b/pkgs/by-name/pi/pid-fan-controller/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage { rev = version; hash = "sha256-ALR9Qa0AhcGyc3+7x5CEG/72+bJzhaEoIvQNL+QjldY="; }; - cargoHash = "sha256-u1Y1k1I5gRzpDHhRJZCCtMTwAvtCaIy3uXQTvmtEx5w="; + cargoHash = "sha256-Y57VSheI94b43SwNCDdFvcNxzkA16KObBvzZ6ywYAyU="; meta = { description = "Service to provide closed-loop PID fan control"; From 3d79a4a1e26e7db720cb958825f7aad3a9e99b93 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Mon, 28 Apr 2025 18:14:49 +0900 Subject: [PATCH 06/93] shogihome: backport patch from upstream This patch has been merged in upstream. https://github.com/sunfish-shogi/shogihome/commit/a075571a3bf4f536487e1212a2e7a13802dc7ec7 --- .../shogihome/electron-builder-config.patch | 51 ------------------- pkgs/by-name/sh/shogihome/package.nix | 14 ++++- 2 files changed, 12 insertions(+), 53 deletions(-) delete mode 100644 pkgs/by-name/sh/shogihome/electron-builder-config.patch diff --git a/pkgs/by-name/sh/shogihome/electron-builder-config.patch b/pkgs/by-name/sh/shogihome/electron-builder-config.patch deleted file mode 100644 index d06eb5ab6988..000000000000 --- a/pkgs/by-name/sh/shogihome/electron-builder-config.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/scripts/build.mjs b/scripts/build.mjs -index ba5c7f60..2c454446 100644 ---- a/scripts/build.mjs -+++ b/scripts/build.mjs -@@ -1,14 +1,11 @@ - /* eslint-disable no-console */ --import * as builder from "electron-builder"; - import fs from "node:fs"; - --const target = process.argv[2]; -- - /** - * @type {import('electron-builder').Configuration} - * @see https://www.electron.build/configuration/configuration - */ --const config = { -+export default { - productName: "ShogiHome", - extraMetadata: { - main: "dist/packed/background.js", -@@ -73,7 +70,7 @@ const config = { - }, - }, - linux: { -- target: "AppImage", -+ target: "dir", - fileAssociations: [ - { name: "KIF", ext: "kif" }, - { name: "KIFU", ext: "kifu" }, -@@ -85,21 +82,3 @@ const config = { - }, - publish: null, - }; -- --switch (target) { -- case "portable": -- config.win.target = "portable"; -- break; --} -- --builder -- .build({ -- universal: process.platform === "darwin", -- config, -- }) -- .then((result) => { -- console.log(JSON.stringify(result)); -- }) -- .catch((error) => { -- throw error; -- }); diff --git a/pkgs/by-name/sh/shogihome/package.nix b/pkgs/by-name/sh/shogihome/package.nix index 4a4043b67ff6..3e67d315d25f 100644 --- a/pkgs/by-name/sh/shogihome/package.nix +++ b/pkgs/by-name/sh/shogihome/package.nix @@ -3,6 +3,7 @@ stdenv, buildNpmPackage, fetchFromGitHub, + fetchpatch, makeWrapper, electron_35, vulkan-loader, @@ -29,13 +30,22 @@ buildNpmPackage (finalAttrs: { npmDepsHash = "sha256-OS5DR+24F98ICgQ6zL4VD231Rd5JB/gJKl+qNfnP3PE="; patches = [ - ./electron-builder-config.patch + # Make it possible to load the electron-builder config without sideeffects. + # PR at https://github.com/sunfish-shogi/shogihome/pull/1184 + # Should be removed next 1.22.X ShogiHome update or possibly 1.23.X. + (fetchpatch { + url = "https://github.com/sunfish-shogi/shogihome/commit/a075571a3bf4f536487e1212a2e7a13802dc7ec7.patch"; + sha256 = "sha256-dJyaoWOC+fEufzpYenmfnblgd2C9Ymv4Cl8Y/hljY6c="; + }) ]; postPatch = '' substituteInPlace package.json \ --replace-fail 'npm run install:esbuild && ' "" \ --replace-fail 'npm run install:electron && ' "" + + substituteInPlace .electron-builder.config.mjs \ + --replace-fail 'AppImage' 'dir' ''; env = { @@ -69,7 +79,7 @@ buildNpmPackage (finalAttrs: { ./node_modules/.bin/electron-builder \ --dir \ - --config scripts/build.mjs \ + --config .electron-builder.config.mjs \ -c.electronDist=electron-dist \ -c.electronVersion=${electron.version} From 58f9393f9809e8a28727b1244191cc1ad02e6c27 Mon Sep 17 00:00:00 2001 From: hakan-demirli Date: Thu, 20 Feb 2025 02:55:35 +0300 Subject: [PATCH 07/93] xremap: init at 0.10.10 --- pkgs/by-name/xr/xremap/package.nix | 87 ++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 pkgs/by-name/xr/xremap/package.nix diff --git a/pkgs/by-name/xr/xremap/package.nix b/pkgs/by-name/xr/xremap/package.nix new file mode 100644 index 000000000000..ad0aa28b9eea --- /dev/null +++ b/pkgs/by-name/xr/xremap/package.nix @@ -0,0 +1,87 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, +}: +let + pname = "xremap"; + version = "0.10.10"; + + src = fetchFromGitHub { + owner = "xremap"; + repo = pname; + tag = "v${version}"; + hash = "sha256-U2TSx0O2T53lUiJNpSCUyvkG4Awa0+a4N6meFn09LbI="; + }; + + cargoHash = "sha256-8IVexszltzlBBShGkjZwyDKs02udrVpZEOwfzRzAraU="; + + buildXremap = + { + suffix ? "", + features ? [ ], + descriptionSuffix ? "", + }: + assert descriptionSuffix != "" && features != [ ]; + rustPlatform.buildRustPackage { + pname = "${pname}${suffix}"; + inherit version src cargoHash; + + nativeBuildInputs = [ pkg-config ]; + + buildNoDefaultFeatures = true; + buildFeatures = features; + + useFetchCargoVendor = true; + + meta = { + description = + "Key remapper for X11 and Wayland" + + lib.optionalString (descriptionSuffix != "") " (${descriptionSuffix} support)"; + homepage = "https://github.com/xremap/xremap"; + changelog = "https://github.com/xremap/xremap/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + mainProgram = "xremap"; + maintainers = [ lib.maintainers.hakan-demirli ]; + platforms = lib.platforms.linux; + }; + }; + + variants = { + x11 = buildXremap { + features = [ "x11" ]; + descriptionSuffix = "X11"; + }; + gnome = buildXremap { + suffix = "-gnome"; + features = [ "gnome" ]; + descriptionSuffix = "Gnome"; + }; + kde = buildXremap { + suffix = "-kde"; + features = [ "kde" ]; + descriptionSuffix = "KDE"; + }; + wlroots = buildXremap { + suffix = "-wlroots"; + features = [ "wlroots" ]; + descriptionSuffix = "wlroots"; + }; + hyprland = buildXremap { + suffix = "-hyprland"; + features = [ "hypr" ]; + descriptionSuffix = "Hyprland"; + }; + }; + +in +variants.wlroots.overrideAttrs (finalAttrs: { + passthru = { + gnome = variants.gnome; + kde = variants.kde; + wlroots = variants.wlroots; + hyprland = variants.hyprland; + x11 = variants.x11; + }; +}) From 652b4e144f1c7b838039a536e58963354801c4af Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 1 May 2025 09:32:24 -0500 Subject: [PATCH 08/93] git-fame: Migrate to by-name git-fame: 3.1.1 -> 3.2.19 --- .../version-management/git-fame/Gemfile.lock | 155 ---- .../version-management/git-fame/gemset.nix | 741 ------------------ .../gi}/git-fame/Gemfile | 0 pkgs/by-name/gi/git-fame/Gemfile.lock | 107 +++ pkgs/by-name/gi/git-fame/gemset.nix | 459 +++++++++++ .../gi/git-fame/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 - 7 files changed, 566 insertions(+), 898 deletions(-) delete mode 100644 pkgs/applications/version-management/git-fame/Gemfile.lock delete mode 100644 pkgs/applications/version-management/git-fame/gemset.nix rename pkgs/{applications/version-management => by-name/gi}/git-fame/Gemfile (100%) create mode 100644 pkgs/by-name/gi/git-fame/Gemfile.lock create mode 100644 pkgs/by-name/gi/git-fame/gemset.nix rename pkgs/{applications/version-management/git-fame/default.nix => by-name/gi/git-fame/package.nix} (100%) diff --git a/pkgs/applications/version-management/git-fame/Gemfile.lock b/pkgs/applications/version-management/git-fame/Gemfile.lock deleted file mode 100644 index 23d6db943e49..000000000000 --- a/pkgs/applications/version-management/git-fame/Gemfile.lock +++ /dev/null @@ -1,155 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - git_fame (3.1.1) - activesupport (~> 7.0) - dry-initializer (~> 3.0) - dry-struct (~> 1.0) - dry-types (~> 1.0) - neatjson (~> 0.9) - rugged (~> 1.0) - tty-box (~> 0.5) - tty-option (~> 0.2) - tty-screen (~> 0.5) - tty-spinner (~> 0.9) - tty-table (~> 0.9, <= 0.10.0) - zeitwerk (~> 2.0) - activesupport (7.0.6) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 1.6, < 2) - minitest (>= 5.1) - tzinfo (~> 2.0) - ast (2.4.2) - coderay (1.1.3) - concurrent-ruby (1.2.2) - diff-lcs (1.5.0) - docile (1.4.0) - dry-core (1.0.0) - concurrent-ruby (~> 1.0) - zeitwerk (~> 2.6) - dry-inflector (1.0.0) - dry-initializer (3.1.1) - dry-logic (1.5.0) - concurrent-ruby (~> 1.0) - dry-core (~> 1.0, < 2) - zeitwerk (~> 2.6) - dry-struct (1.6.0) - dry-core (~> 1.0, < 2) - dry-types (>= 1.7, < 2) - ice_nine (~> 0.11) - zeitwerk (~> 2.6) - dry-types (1.7.1) - concurrent-ruby (~> 1.0) - dry-core (~> 1.0) - dry-inflector (~> 1.0) - dry-logic (~> 1.4) - zeitwerk (~> 2.6) - equatable (0.5.0) - factory_bot (6.2.1) - activesupport (>= 5.0.0) - faker (3.1.1) - i18n (>= 1.8.11, < 2) - i18n (1.14.1) - concurrent-ruby (~> 1.0) - ice_nine (0.11.2) - method_source (1.0.0) - minitest (5.18.1) - neatjson (0.10.5) - necromancer (0.4.0) - parallel (1.22.1) - parser (3.2.1.1) - ast (~> 2.4.1) - pastel (0.7.2) - equatable (~> 0.5.0) - tty-color (~> 0.4.0) - pry (0.14.2) - coderay (~> 1.1) - method_source (~> 1.0) - rainbow (3.1.1) - rake (13.0.6) - regexp_parser (2.7.0) - rexml (3.2.5) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) - rspec-core (3.12.1) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-github (2.4.0) - rspec-core (~> 3.0) - rspec-its (1.3.0) - rspec-core (>= 3.0.0) - rspec-expectations (>= 3.0.0) - rspec-mocks (3.12.4) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-support (3.12.0) - rubocop (1.24.1) - parallel (~> 1.10) - parser (>= 3.0.0.0) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.15.1, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.28.0) - parser (>= 3.2.1.0) - rubocop-md (1.2.0) - rubocop (>= 1.0) - rubocop-performance (1.16.0) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) - rubocop-rake (0.6.0) - rubocop (~> 1.0) - rubocop-rspec (2.11.1) - rubocop (~> 1.19) - ruby-progressbar (1.13.0) - rugged (1.6.3) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-cobertura (2.1.0) - rexml - simplecov (~> 0.19) - simplecov-html (0.12.3) - simplecov_json_formatter (0.1.4) - strings (0.1.8) - strings-ansi (~> 0.1) - unicode-display_width (~> 1.5) - unicode_utils (~> 1.4) - strings-ansi (0.2.0) - tty-box (0.5.0) - pastel (~> 0.7.2) - strings (~> 0.1.6) - tty-cursor (~> 0.7) - tty-color (0.4.3) - tty-cursor (0.7.1) - tty-option (0.2.0) - tty-screen (0.6.5) - tty-spinner (0.9.3) - tty-cursor (~> 0.7) - tty-table (0.10.0) - equatable (~> 0.5.0) - necromancer (~> 0.4.0) - pastel (~> 0.7.2) - strings (~> 0.1.0) - tty-screen (~> 0.6.4) - tzinfo (2.0.6) - concurrent-ruby (~> 1.0) - unicode-display_width (1.8.0) - unicode_utils (1.4.0) - zeitwerk (2.6.7) - -PLATFORMS - ruby - -DEPENDENCIES - git_fame - -BUNDLED WITH - 2.3.3 diff --git a/pkgs/applications/version-management/git-fame/gemset.nix b/pkgs/applications/version-management/git-fame/gemset.nix deleted file mode 100644 index 5212cfbcb8f3..000000000000 --- a/pkgs/applications/version-management/git-fame/gemset.nix +++ /dev/null @@ -1,741 +0,0 @@ -{ - activesupport = { - dependencies = [ - "concurrent-ruby" - "i18n" - "minitest" - "tzinfo" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1cjsf26656996hv48wgv2mkwxf0fy1qc68ikgzq7mzfq2mmvmayk"; - type = "gem"; - }; - version = "7.0.6"; - }; - ast = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; - type = "gem"; - }; - version = "2.4.2"; - }; - coderay = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw"; - type = "gem"; - }; - version = "1.1.3"; - }; - concurrent-ruby = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; - type = "gem"; - }; - version = "1.2.2"; - }; - diff-lcs = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9"; - type = "gem"; - }; - version = "1.5.0"; - }; - docile = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1lxqxgq71rqwj1lpl9q1mbhhhhhhdkkj7my341f2889pwayk85sz"; - type = "gem"; - }; - version = "1.4.0"; - }; - dry-core = { - dependencies = [ - "concurrent-ruby" - "zeitwerk" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "01gks2hrp7nl3pzb487azvd25dlbrc40d5cpk4n0szwnf2c0k4ks"; - type = "gem"; - }; - version = "1.0.0"; - }; - dry-inflector = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "09hnvna3lg2x36li63988kv664d0zvy7y0z33803yvrdr9hj7lka"; - type = "gem"; - }; - version = "1.0.0"; - }; - dry-initializer = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1v3dah1r96b10m8xjixmdmymg7dr16wn5715id4vxjkw6vm7s9jd"; - type = "gem"; - }; - version = "3.1.1"; - }; - dry-logic = { - dependencies = [ - "concurrent-ruby" - "dry-core" - "zeitwerk" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "05nldkc154r0qzlhss7n5klfiyyz05x2fkq08y13s34py6023vcr"; - type = "gem"; - }; - version = "1.5.0"; - }; - dry-struct = { - dependencies = [ - "dry-core" - "dry-types" - "ice_nine" - "zeitwerk" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1rnlgn4wif0dvkvi10xwh1vd1q6mp35q6a7lwva0zmbc79dh4drp"; - type = "gem"; - }; - version = "1.6.0"; - }; - dry-types = { - dependencies = [ - "concurrent-ruby" - "dry-core" - "dry-inflector" - "dry-logic" - "zeitwerk" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1f6dz0hm67rhybh6xq2s3vvr700cp43kf50z2lids62s2i0mh5hj"; - type = "gem"; - }; - version = "1.7.1"; - }; - equatable = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1sjm9zjakyixyvsqziikdrsqfzis6j3fq23crgjkp6fwkfgndj7x"; - type = "gem"; - }; - version = "0.5.0"; - }; - factory_bot = { - dependencies = [ "activesupport" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1pfk942d6qwhw151hxaz7n4knk6whyxqvvywdx2cdw9yhykyaqzq"; - type = "gem"; - }; - version = "6.2.1"; - }; - faker = { - dependencies = [ "i18n" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1b8772jybi0vxzbcs5zw17k40z661c8adn2rd6vqqr7ay71bzl09"; - type = "gem"; - }; - version = "3.1.1"; - }; - git_fame = { - dependencies = [ - "activesupport" - "dry-initializer" - "dry-struct" - "dry-types" - "neatjson" - "rugged" - "tty-box" - "tty-option" - "tty-screen" - "tty-spinner" - "tty-table" - "zeitwerk" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1jqvhzwgvr2bpi4ldqidbcs9prb0xsikp50xx4r8dwhf8m9mh26h"; - type = "gem"; - }; - version = "3.1.1"; - }; - i18n = { - dependencies = [ "concurrent-ruby" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; - type = "gem"; - }; - version = "1.14.1"; - }; - ice_nine = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x"; - type = "gem"; - }; - version = "0.11.2"; - }; - method_source = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp"; - type = "gem"; - }; - version = "1.0.0"; - }; - minitest = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1kg9wh7jlc9zsr3hkhpzkbn0ynf4np5ap9m2d8xdrb8shy0y6pmb"; - type = "gem"; - }; - version = "5.18.1"; - }; - neatjson = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0wm1lq8yl6rzysh3wg6fa55w5534k6ppiz0qb7jyvdy582mk5i0s"; - type = "gem"; - }; - version = "0.10.5"; - }; - necromancer = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0v9nhdkv6zrp7cn48xv7n2vjhsbslpvs0ha36mfkcd56cp27pavz"; - type = "gem"; - }; - version = "0.4.0"; - }; - parallel = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb"; - type = "gem"; - }; - version = "1.22.1"; - }; - parser = { - dependencies = [ "ast" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1a2v5f8fw7nxm41xp422p1pbr41hafy62bp95m7vg42cqp5y4grc"; - type = "gem"; - }; - version = "3.2.1.1"; - }; - pastel = { - dependencies = [ - "equatable" - "tty-color" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1yf30d9kzpm96gw9kwbv31p0qigwfykn8qdis5950plnzgc1vlp1"; - type = "gem"; - }; - version = "0.7.2"; - }; - pry = { - dependencies = [ - "coderay" - "method_source" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0k9kqkd9nps1w1r1rb7wjr31hqzkka2bhi8b518x78dcxppm9zn4"; - type = "gem"; - }; - version = "0.14.2"; - }; - rainbow = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; - type = "gem"; - }; - version = "3.1.1"; - }; - rake = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; - type = "gem"; - }; - version = "13.0.6"; - }; - regexp_parser = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0d6241adx6drsfzz74nx1ld3394nm6fjpv3ammzr0g659krvgf7q"; - type = "gem"; - }; - version = "2.7.0"; - }; - rexml = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; - type = "gem"; - }; - version = "3.2.5"; - }; - rspec = { - dependencies = [ - "rspec-core" - "rspec-expectations" - "rspec-mocks" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c"; - type = "gem"; - }; - version = "3.12.0"; - }; - rspec-core = { - dependencies = [ "rspec-support" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0da45cvllbv39sdbsl65vp5djb2xf5m10mxc9jm7rsqyyxjw4h1f"; - type = "gem"; - }; - version = "3.12.1"; - }; - rspec-expectations = { - dependencies = [ - "diff-lcs" - "rspec-support" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6"; - type = "gem"; - }; - version = "3.12.2"; - }; - rspec-github = { - dependencies = [ "rspec-core" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0kqjmd85v2fpb06d0rx43dc51f0igc1gmm8y3nz0wvmy7zg02njm"; - type = "gem"; - }; - version = "2.4.0"; - }; - rspec-its = { - dependencies = [ - "rspec-core" - "rspec-expectations" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "15zafd70gxly5i0s00nky14sj2n92dnj3xpj83ysl3c2wx0119ad"; - type = "gem"; - }; - version = "1.3.0"; - }; - rspec-mocks = { - dependencies = [ - "diff-lcs" - "rspec-support" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1dcfh85m3ksir6n8gydsal4d85chpww1b2nahb05nl8xhgh0r2ij"; - type = "gem"; - }; - version = "3.12.4"; - }; - rspec-support = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx"; - type = "gem"; - }; - version = "3.12.0"; - }; - rubocop = { - dependencies = [ - "parallel" - "parser" - "rainbow" - "regexp_parser" - "rexml" - "rubocop-ast" - "ruby-progressbar" - "unicode-display_width" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1sn7ag295blmhpwv6x472m3fd0n25swz9imqwpk0hg21rdcdw7p0"; - type = "gem"; - }; - version = "1.24.1"; - }; - rubocop-ast = { - dependencies = [ "parser" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0n2gsafg6p7nr1z8i1hkvp2qqkkbg842ba183dnl0h08xd9ms6q5"; - type = "gem"; - }; - version = "1.28.0"; - }; - rubocop-md = { - dependencies = [ "rubocop" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "11j802r5r022vxzycvwvzhyg24g8dky4slbvid24xi0ji73q444z"; - type = "gem"; - }; - version = "1.2.0"; - }; - rubocop-performance = { - dependencies = [ - "rubocop" - "rubocop-ast" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1n7g0vg06ldjaq4f8c11c7yqy99zng1qdrkkk4kfziippy24yxnc"; - type = "gem"; - }; - version = "1.16.0"; - }; - rubocop-rake = { - dependencies = [ "rubocop" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1nyq07sfb3vf3ykc6j2d5yq824lzq1asb474yka36jxgi4hz5djn"; - type = "gem"; - }; - version = "0.6.0"; - }; - rubocop-rspec = { - dependencies = [ "rubocop" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0ivc9kgz18cn32iqi9wv5aj903yhamwddw84l7nklbl9xxvwz603"; - type = "gem"; - }; - version = "2.11.1"; - }; - ruby-progressbar = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40"; - type = "gem"; - }; - version = "1.13.0"; - }; - rugged = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "016bawsahkhxx7p8azxirpl7y2y7i8a027pj8910gwf6ipg329in"; - type = "gem"; - }; - version = "1.6.3"; - }; - simplecov = { - dependencies = [ - "docile" - "simplecov-html" - "simplecov_json_formatter" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "198kcbrjxhhzca19yrdcd6jjj9sb51aaic3b0sc3pwjghg3j49py"; - type = "gem"; - }; - version = "0.22.0"; - }; - simplecov-cobertura = { - dependencies = [ - "rexml" - "simplecov" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "00izmp202y48qvmvwrh5x56cc5ivbjhgkkkjklvqmqzj9pik4r9c"; - type = "gem"; - }; - version = "2.1.0"; - }; - simplecov-html = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0yx01bxa8pbf9ip4hagqkp5m0mqfnwnw2xk8kjraiywz4lrss6jb"; - type = "gem"; - }; - version = "0.12.3"; - }; - simplecov_json_formatter = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0a5l0733hj7sk51j81ykfmlk2vd5vaijlq9d5fn165yyx3xii52j"; - type = "gem"; - }; - version = "0.1.4"; - }; - strings = { - dependencies = [ - "strings-ansi" - "unicode-display_width" - "unicode_utils" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "111876lcqrykh30w7zzkrl06d6rj9lq24y625m28674vgfxkkcz0"; - type = "gem"; - }; - version = "0.1.8"; - }; - strings-ansi = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "120wa6yjc63b84lprglc52f40hx3fx920n4dmv14rad41rv2s9lh"; - type = "gem"; - }; - version = "0.2.0"; - }; - tty-box = { - dependencies = [ - "pastel" - "strings" - "tty-cursor" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "14g63v0jx87hba50rlv3c521zg9rw0f5d31cihcvym19xxa7v3l5"; - type = "gem"; - }; - version = "0.5.0"; - }; - tty-color = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0zz5xa6xbrj69h334d8nx7z732fz80s1a0b02b53mim95p80s7bk"; - type = "gem"; - }; - version = "0.4.3"; - }; - tty-cursor = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr"; - type = "gem"; - }; - version = "0.7.1"; - }; - tty-option = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0xibs7kgbsw401ywfw67wg47fmm7sdcypy85m25af9r2q2hbq7gb"; - type = "gem"; - }; - version = "0.2.0"; - }; - tty-screen = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0azpjgyhdm8ycblnx9crq3dgb2x8yg454a13n60zfpsc0n138sw1"; - type = "gem"; - }; - version = "0.6.5"; - }; - tty-spinner = { - dependencies = [ "tty-cursor" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0hh5awmijnzw9flmh5ak610x1d00xiqagxa5mbr63ysggc26y0qf"; - type = "gem"; - }; - version = "0.9.3"; - }; - tty-table = { - dependencies = [ - "equatable" - "necromancer" - "pastel" - "strings" - "tty-screen" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "05krrj1x5pmfbz74paszrsr1316w9b9jlc4wpd9s9gpzqfzwjzcg"; - type = "gem"; - }; - version = "0.10.0"; - }; - tzinfo = { - dependencies = [ "concurrent-ruby" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; - type = "gem"; - }; - version = "2.0.6"; - }; - unicode-display_width = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2"; - type = "gem"; - }; - version = "1.8.0"; - }; - unicode_utils = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0h1a5yvrxzlf0lxxa1ya31jcizslf774arnsd89vgdhk4g7x08mr"; - type = "gem"; - }; - version = "1.4.0"; - }; - zeitwerk = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "028ld9qmgdllxrl7d0qkl65s58wb1n3gv8yjs28g43a8b1hplxk1"; - type = "gem"; - }; - version = "2.6.7"; - }; -} diff --git a/pkgs/applications/version-management/git-fame/Gemfile b/pkgs/by-name/gi/git-fame/Gemfile similarity index 100% rename from pkgs/applications/version-management/git-fame/Gemfile rename to pkgs/by-name/gi/git-fame/Gemfile diff --git a/pkgs/by-name/gi/git-fame/Gemfile.lock b/pkgs/by-name/gi/git-fame/Gemfile.lock new file mode 100644 index 000000000000..a74973e59a0e --- /dev/null +++ b/pkgs/by-name/gi/git-fame/Gemfile.lock @@ -0,0 +1,107 @@ +GEM + remote: https://rubygems.org/ + specs: + activesupport (8.0.2) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + logger (>= 1.4.2) + minitest (>= 5.1) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) + base64 (0.2.0) + benchmark (0.4.0) + bigdecimal (3.1.9) + concurrent-ruby (1.3.5) + connection_pool (2.5.3) + drb (2.2.1) + dry-core (1.1.0) + concurrent-ruby (~> 1.0) + logger + zeitwerk (~> 2.6) + dry-inflector (1.2.0) + dry-initializer (3.2.0) + dry-logic (1.6.0) + bigdecimal + concurrent-ruby (~> 1.0) + dry-core (~> 1.1) + zeitwerk (~> 2.6) + dry-struct (1.8.0) + dry-core (~> 1.1) + dry-types (~> 1.8, >= 1.8.2) + ice_nine (~> 0.11) + zeitwerk (~> 2.6) + dry-types (1.8.2) + bigdecimal (~> 3.0) + concurrent-ruby (~> 1.0) + dry-core (~> 1.0) + dry-inflector (~> 1.0) + dry-logic (~> 1.4) + zeitwerk (~> 2.6) + equatable (0.5.0) + git_fame (3.2.19) + activesupport (>= 7, < 9) + dry-initializer (~> 3.0) + dry-struct (~> 1.0) + dry-types (~> 1.0) + neatjson (~> 0.9) + rugged (~> 1.0) + tty-box (~> 0.5) + tty-option (~> 0.2) + tty-screen (~> 0.5) + tty-spinner (~> 0.9) + tty-table (~> 0.9, <= 0.10.0) + zeitwerk (~> 2.0) + i18n (1.14.7) + concurrent-ruby (~> 1.0) + ice_nine (0.11.2) + logger (1.7.0) + minitest (5.25.5) + neatjson (0.10.5) + necromancer (0.4.0) + pastel (0.7.2) + equatable (~> 0.5.0) + tty-color (~> 0.4.0) + rugged (1.9.0) + securerandom (0.4.1) + strings (0.1.8) + strings-ansi (~> 0.1) + unicode-display_width (~> 1.5) + unicode_utils (~> 1.4) + strings-ansi (0.2.0) + tty-box (0.5.0) + pastel (~> 0.7.2) + strings (~> 0.1.6) + tty-cursor (~> 0.7) + tty-color (0.4.3) + tty-cursor (0.7.1) + tty-option (0.3.0) + tty-screen (0.6.5) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + tty-table (0.10.0) + equatable (~> 0.5.0) + necromancer (~> 0.4.0) + pastel (~> 0.7.2) + strings (~> 0.1.0) + tty-screen (~> 0.6.4) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + unicode-display_width (1.8.0) + unicode_utils (1.4.0) + uri (1.0.3) + zeitwerk (2.7.2) + +PLATFORMS + ruby + +DEPENDENCIES + git_fame + +BUNDLED WITH + 2.6.6 diff --git a/pkgs/by-name/gi/git-fame/gemset.nix b/pkgs/by-name/gi/git-fame/gemset.nix new file mode 100644 index 000000000000..fc0b1c3d9a2c --- /dev/null +++ b/pkgs/by-name/gi/git-fame/gemset.nix @@ -0,0 +1,459 @@ +{ + activesupport = { + dependencies = [ + "base64" + "benchmark" + "bigdecimal" + "concurrent-ruby" + "connection_pool" + "drb" + "i18n" + "logger" + "minitest" + "securerandom" + "tzinfo" + "uri" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0pm40y64wfc50a9sj87kxvil2102rmpdcbv82zf0r40vlgdwsrc5"; + type = "gem"; + }; + version = "8.0.2"; + }; + base64 = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; + benchmark = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg"; + type = "gem"; + }; + version = "0.4.0"; + }; + bigdecimal = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g"; + type = "gem"; + }; + version = "3.1.9"; + }; + concurrent-ruby = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1"; + type = "gem"; + }; + version = "1.3.5"; + }; + connection_pool = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg"; + type = "gem"; + }; + version = "2.5.3"; + }; + drb = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; + type = "gem"; + }; + version = "2.2.1"; + }; + dry-core = { + dependencies = [ + "concurrent-ruby" + "logger" + "zeitwerk" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "15di39ssfkwigyyqla65n4x6cfhgwa4cv8j5lmyrlr07jwd840q9"; + type = "gem"; + }; + version = "1.1.0"; + }; + dry-inflector = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0blgyg9l4gpzhb7rs9hqq9j7br80ngiigjp2ayp78w6m1ysx1x92"; + type = "gem"; + }; + version = "1.2.0"; + }; + dry-initializer = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1qy4cv0j0ahabprdbp02nc3r1606jd5dp90lzqg0mp0jz6c9gm9p"; + type = "gem"; + }; + version = "3.2.0"; + }; + dry-logic = { + dependencies = [ + "bigdecimal" + "concurrent-ruby" + "dry-core" + "zeitwerk" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "18nf8mbnhgvkw34drj7nmvpx2afmyl2nyzncn3wl3z4h1yyfsvys"; + type = "gem"; + }; + version = "1.6.0"; + }; + dry-struct = { + dependencies = [ + "dry-core" + "dry-types" + "ice_nine" + "zeitwerk" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0ri9iqxknxvvhpbshf6jn7bq581k8l67iv23mii69yr4k5aqphvl"; + type = "gem"; + }; + version = "1.8.0"; + }; + dry-types = { + dependencies = [ + "bigdecimal" + "concurrent-ruby" + "dry-core" + "dry-inflector" + "dry-logic" + "zeitwerk" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03zcngwfpq0nx9wmxma0s1c6sb3xxph93q8j7dy75721d7d9lkn8"; + type = "gem"; + }; + version = "1.8.2"; + }; + equatable = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1sjm9zjakyixyvsqziikdrsqfzis6j3fq23crgjkp6fwkfgndj7x"; + type = "gem"; + }; + version = "0.5.0"; + }; + git_fame = { + dependencies = [ + "activesupport" + "dry-initializer" + "dry-struct" + "dry-types" + "neatjson" + "rugged" + "tty-box" + "tty-option" + "tty-screen" + "tty-spinner" + "tty-table" + "zeitwerk" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1891k7v2ld5p9v9zlc80s7qkqdxs1wpw6m40gx1wr273n177jal8"; + type = "gem"; + }; + version = "3.2.19"; + }; + i18n = { + dependencies = [ "concurrent-ruby" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf"; + type = "gem"; + }; + version = "1.14.7"; + }; + ice_nine = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x"; + type = "gem"; + }; + version = "0.11.2"; + }; + logger = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr"; + type = "gem"; + }; + version = "1.7.0"; + }; + minitest = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr"; + type = "gem"; + }; + version = "5.25.5"; + }; + neatjson = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0wm1lq8yl6rzysh3wg6fa55w5534k6ppiz0qb7jyvdy582mk5i0s"; + type = "gem"; + }; + version = "0.10.5"; + }; + necromancer = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0v9nhdkv6zrp7cn48xv7n2vjhsbslpvs0ha36mfkcd56cp27pavz"; + type = "gem"; + }; + version = "0.4.0"; + }; + pastel = { + dependencies = [ + "equatable" + "tty-color" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1yf30d9kzpm96gw9kwbv31p0qigwfykn8qdis5950plnzgc1vlp1"; + type = "gem"; + }; + version = "0.7.2"; + }; + rugged = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1b7gcf6pxg4x607bica68dbz22b4kch33yi0ils6x3c8ql9akakz"; + type = "gem"; + }; + version = "1.9.0"; + }; + securerandom = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1cd0iriqfsf1z91qg271sm88xjnfd92b832z49p1nd542ka96lfc"; + type = "gem"; + }; + version = "0.4.1"; + }; + strings = { + dependencies = [ + "strings-ansi" + "unicode-display_width" + "unicode_utils" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "111876lcqrykh30w7zzkrl06d6rj9lq24y625m28674vgfxkkcz0"; + type = "gem"; + }; + version = "0.1.8"; + }; + strings-ansi = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "120wa6yjc63b84lprglc52f40hx3fx920n4dmv14rad41rv2s9lh"; + type = "gem"; + }; + version = "0.2.0"; + }; + tty-box = { + dependencies = [ + "pastel" + "strings" + "tty-cursor" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14g63v0jx87hba50rlv3c521zg9rw0f5d31cihcvym19xxa7v3l5"; + type = "gem"; + }; + version = "0.5.0"; + }; + tty-color = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0zz5xa6xbrj69h334d8nx7z732fz80s1a0b02b53mim95p80s7bk"; + type = "gem"; + }; + version = "0.4.3"; + }; + tty-cursor = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr"; + type = "gem"; + }; + version = "0.7.1"; + }; + tty-option = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "019ir4bcr8fag7dmq7ph6ilpvwjbv4qalip0bz7dlddbd6fk4vjs"; + type = "gem"; + }; + version = "0.3.0"; + }; + tty-screen = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0azpjgyhdm8ycblnx9crq3dgb2x8yg454a13n60zfpsc0n138sw1"; + type = "gem"; + }; + version = "0.6.5"; + }; + tty-spinner = { + dependencies = [ "tty-cursor" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0hh5awmijnzw9flmh5ak610x1d00xiqagxa5mbr63ysggc26y0qf"; + type = "gem"; + }; + version = "0.9.3"; + }; + tty-table = { + dependencies = [ + "equatable" + "necromancer" + "pastel" + "strings" + "tty-screen" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05krrj1x5pmfbz74paszrsr1316w9b9jlc4wpd9s9gpzqfzwjzcg"; + type = "gem"; + }; + version = "0.10.0"; + }; + tzinfo = { + dependencies = [ "concurrent-ruby" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; + type = "gem"; + }; + version = "2.0.6"; + }; + unicode-display_width = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2"; + type = "gem"; + }; + version = "1.8.0"; + }; + unicode_utils = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0h1a5yvrxzlf0lxxa1ya31jcizslf774arnsd89vgdhk4g7x08mr"; + type = "gem"; + }; + version = "1.4.0"; + }; + uri = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9"; + type = "gem"; + }; + version = "1.0.3"; + }; + zeitwerk = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0ws6rpyj0y9iadjg1890dwnnbjfdbzxsv6r48zbj7f8yn5y0cbl4"; + type = "gem"; + }; + version = "2.7.2"; + }; +} diff --git a/pkgs/applications/version-management/git-fame/default.nix b/pkgs/by-name/gi/git-fame/package.nix similarity index 100% rename from pkgs/applications/version-management/git-fame/default.nix rename to pkgs/by-name/gi/git-fame/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d42e271fc30f..00cc779857a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1329,8 +1329,6 @@ with pkgs; git-credential-manager = callPackage ../applications/version-management/git-credential-manager { }; - git-fame = callPackage ../applications/version-management/git-fame { }; - git-gone = callPackage ../applications/version-management/git-gone { inherit (darwin.apple_sdk.frameworks) Security; }; From 86e5db86ac2fa09e6bf1516bfbb6680fa1ca4693 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 May 2025 15:36:27 +0000 Subject: [PATCH 09/93] python312Packages.netbox-dns: 1.2.7 -> 1.2.11 --- pkgs/development/python-modules/netbox-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/netbox-dns/default.nix b/pkgs/development/python-modules/netbox-dns/default.nix index 5838982bbc26..469a1a6984da 100644 --- a/pkgs/development/python-modules/netbox-dns/default.nix +++ b/pkgs/development/python-modules/netbox-dns/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec { pname = "netbox-plugin-dns"; - version = "1.2.7"; + version = "1.2.11"; pyproject = true; src = fetchFromGitHub { owner = "peteeckel"; repo = "netbox-plugin-dns"; tag = version; - hash = "sha256-l0jPn4dyUHm/E8tmSpmSXkSRa5dsD7ap8Gl3RSdfRoU="; + hash = "sha256-cT2nvPDsvZBVuhvvORtxwb2TDHqnSpvpIJFkGZy1CEc="; }; build-system = [ setuptools ]; From ce4e21ebe39ee059b910eceabe383f21dd332c30 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 1 May 2025 21:50:10 +0200 Subject: [PATCH 10/93] python3Packages.aiogram: updateScript ignore mislabeled version --- pkgs/development/python-modules/aiogram/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index b27fce427cf3..c2fc4f037e93 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -87,7 +87,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiogram" ]; - passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + ignoredVersions = "4.1"; + }; __darwinAllowLocalNetworking = true; From 51309d87b2995373fde9f45a1ae0995126c473cd Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 1 May 2025 19:51:02 +0000 Subject: [PATCH 11/93] python3Packages.aiogram: 3.19.0 -> 3.20.0.post0 --- pkgs/development/python-modules/aiogram/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index c2fc4f037e93..cf61b984d932 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "aiogram"; - version = "3.19.0"; + version = "3.20.0.post0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "aiogram"; repo = "aiogram"; tag = "v${version}"; - hash = "sha256-xdDQjH/HUVNJgSxjrqXNgc+hOKuiusAH00PRMRD+8Dw="; + hash = "sha256-OQH5wes2RGSbT9GPKcZVVxpsFbtOnXd6aAeYfQST1Xs="; }; build-system = [ hatchling ]; From cd34fd6f73f73f75f8a3364a5d97b58734bd7a39 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 1 May 2025 21:54:15 +0200 Subject: [PATCH 12/93] python3Packages.aiogram: remove unneeded pytestFlagsArray --- pkgs/development/python-modules/aiogram/default.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index cf61b984d932..27c269c90ccf 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -76,15 +76,6 @@ buildPythonPackage rec { pytz ] ++ lib.flatten (builtins.attrValues optional-dependencies); - pytestFlagsArray = [ - "-W" - "ignore::pluggy.PluggyTeardownRaisedWarning" - "-W" - "ignore::pytest.PytestDeprecationWarning" - "-W" - "ignore::DeprecationWarning" - ]; - pythonImportsCheck = [ "aiogram" ]; passthru.updateScript = gitUpdater { From 0b3f4689091b2a4bce0e4078759e3b4c6f6f3554 Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Thu, 1 May 2025 23:08:25 +0200 Subject: [PATCH 13/93] unconvert: 0-unstable-2023-09-07 -> 0-unstable-2025-02-16 This also fixes the build, which was failing due to Go being updated. --- pkgs/by-name/un/unconvert/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/un/unconvert/package.nix b/pkgs/by-name/un/unconvert/package.nix index 18414630ade3..e9575aa4a48f 100644 --- a/pkgs/by-name/un/unconvert/package.nix +++ b/pkgs/by-name/un/unconvert/package.nix @@ -2,26 +2,29 @@ lib, buildGoModule, fetchFromGitHub, + nix-update-script, }: buildGoModule { pname = "unconvert"; - version = "0-unstable-2023-09-07"; + version = "0-unstable-2025-02-16"; src = fetchFromGitHub { owner = "mdempsky"; repo = "unconvert"; - rev = "415706980c061b6f71ea923bd206aec88785638f"; - hash = "sha256-MchA8uvy+MyQ/VaglBDTC7j/lNIKAtGeeECLoFfH6pI="; + rev = "4a038b3d31f56ff5ba511953b745c80a2317e4ae"; + hash = "sha256-97H5rlb4buRT6I3OUID8/UARFtCTDhIxnPCkpFF9RDs="; }; - vendorHash = "sha256-vZDk+ZNCMP5RRNrgeIowdOKPot7rqM84JhlbfvcQbB4="; + vendorHash = "sha256-Yh33ZvQoMG9YM8bdxlMYEIwH2QMTwv2HSYSmA4C9EpA="; ldflags = [ "-s" "-w" ]; + passthru.updateScript = nix-update-script { extraArgs = lib.singleton "--version=branch"; }; + meta = with lib; { description = "Remove unnecessary type conversions from Go source"; mainProgram = "unconvert"; From 9a895ca2720c5fa08c6b24e926e7978d3deb54b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 May 2025 16:57:01 +0000 Subject: [PATCH 14/93] cri-o-unwrapped: 1.32.3 -> 1.32.4 --- pkgs/applications/virtualization/cri-o/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 94e3374fe7d4..05e1ee00d10f 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.32.3"; + version = "1.32.4"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - hash = "sha256-EIJT/LwxRZUYvbH0EFYSeZpGgFOywI6jpfmFO3g8cps="; + hash = "sha256-zMSGXRJvFPlbJAnrdHMQYLPkS138r5/2/gyJhhoytgs="; }; vendorHash = null; From 19a61890234b91cf306fb53020b49a0c0c63ae20 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 May 2025 17:55:00 +0000 Subject: [PATCH 15/93] diylc: 5.2.0 -> 5.3.0 --- pkgs/by-name/di/diylc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/di/diylc/package.nix b/pkgs/by-name/di/diylc/package.nix index 271a72f9f37d..adbdae1f6721 100644 --- a/pkgs/by-name/di/diylc/package.nix +++ b/pkgs/by-name/di/diylc/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "diylc"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { url = "https://github.com/bancika/diy-layout-creator/releases/download/v${finalAttrs.version}/diylc-${finalAttrs.version}-universal.zip"; - hash = "sha256-lsUA6ksaRpHrVOlpMUIZeuZ+jLpl9GFTBttzUhRplH4="; + hash = "sha256-1oeeU9SkDqS3vF/b4B4ACJ6NjtkS9lQBl7yEF+rFTY0="; }; nativeBuildInputs = [ From 82edda7d1f6e1155c958e860735e84b9c7a45670 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 May 2025 18:47:17 +0000 Subject: [PATCH 16/93] vifm-full: 0.14 -> 0.14.1 --- pkgs/by-name/vi/vifm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/vifm/package.nix b/pkgs/by-name/vi/vifm/package.nix index 2110a038fd3d..96bd1f616588 100644 --- a/pkgs/by-name/vi/vifm/package.nix +++ b/pkgs/by-name/vi/vifm/package.nix @@ -23,11 +23,11 @@ let in stdenv.mkDerivation rec { pname = if isFullPackage then "vifm-full" else "vifm"; - version = "0.14"; + version = "0.14.1"; src = fetchurl { url = "https://github.com/vifm/vifm/releases/download/v${version}/vifm-${version}.tar.bz2"; - hash = "sha256-JxTdTO9OU+eomAroRF6IJ5EE+BXUf0F/oLit/i89G+0="; + hash = "sha256-AfGeEU4p9IHSD6prNaQriDo/SHMk3bL3EHzhwQLEpJY="; }; nativeBuildInputs = [ From b6d01940dbb13b4412473dd42696cac251e8c968 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 May 2025 18:52:03 +0000 Subject: [PATCH 17/93] smlfmt: 1.1.0 -> 1.2.0 --- pkgs/by-name/sm/smlfmt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sm/smlfmt/package.nix b/pkgs/by-name/sm/smlfmt/package.nix index 6eed84bd0bb5..cfe0692d79ec 100644 --- a/pkgs/by-name/sm/smlfmt/package.nix +++ b/pkgs/by-name/sm/smlfmt/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "smlfmt"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "shwestrick"; repo = "smlfmt"; rev = "v${version}"; - hash = "sha256-qwhYOZrck028NliPDnqFZel3IxopQzouhHq6R7DkfPE="; + hash = "sha256-QdpEsypkCzR/OwllKFLjz3/JvzV0OlGiqXUnS7iGD5A="; }; nativeBuildInputs = [ mlton ]; From 3ab432c313abba4e2d4b55c573e90d23c0370770 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 May 2025 19:25:44 +0000 Subject: [PATCH 18/93] plasticity: 25.1.8 -> 25.1.9 --- pkgs/by-name/pl/plasticity/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix index a07b756b6d7b..64a9fe3f2bcf 100644 --- a/pkgs/by-name/pl/plasticity/package.nix +++ b/pkgs/by-name/pl/plasticity/package.nix @@ -34,11 +34,11 @@ }: stdenv.mkDerivation rec { pname = "plasticity"; - version = "25.1.8"; + version = "25.1.9"; src = fetchurl { url = "https://github.com/nkallen/plasticity/releases/download/v${version}/Plasticity-${version}-1.x86_64.rpm"; - hash = "sha256-5PjjEsHchryUhmzqyQ4XqwiycNEVCefmpSW/9jZEzpg="; + hash = "sha256-iNgMsQ6JDPRNKssvgVyZ9z8aUFzemboYgm1wIjuERog="; }; passthru.updateScript = ./update.sh; From 10c5a7d8ae1674695fbc31af35e0e6a999d9b6cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 May 2025 19:48:03 +0000 Subject: [PATCH 19/93] python312Packages.zwave-js-server-python: 0.62.0 -> 0.63.0 --- .../python-modules/zwave-js-server-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index edb9c5aa450a..5e391c4a5b32 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.62.0"; + version = "0.63.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "zwave-js-server-python"; tag = version; - hash = "sha256-V/YydWNSjZVvHeeDNMUTEtMQL6/oJvyXtTG/akELjEs="; + hash = "sha256-GQ55IvicdVi6EfRimuyuEbwGDWQIdpLrgi/3ZCj+wJM="; }; build-system = [ setuptools ]; From 30e7eb8a84fdaf2fec980d9cb7275906ab655d86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 May 2025 20:55:11 +0000 Subject: [PATCH 20/93] terraform-providers.mongodbatlas: 1.33.0 -> 1.34.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f686de10cddf..018c2e57f02b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -831,13 +831,13 @@ "vendorHash": "sha256-1nm2Y4T9/mCWMXMjXEzBz3w08AYHjQJeb9mYPQeWPs0=" }, "mongodbatlas": { - "hash": "sha256-9fgaBOzly/B1kTvTmevoaEHs6s3/i3kGokFqzKWKwwg=", + "hash": "sha256-JQW9y1EfrEInmz2+Er8BE0+6ZdcrO/w1y+czg7jPeRE=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.33.0", + "rev": "v1.34.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-yKNhCFxs2BRU4X9P7ZREmR64u5/8QFFGMk8khXyqUsA=" + "vendorHash": "sha256-y9dhiG0zyOcvjgygLEW2o+GPXUug0ibxC2aLvfcY260=" }, "namecheap": { "hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=", From fcf1b2bf34ca56d197e07835027aa41532c37de0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 May 2025 20:55:46 +0000 Subject: [PATCH 21/93] atasm: 1.27 -> 1.28 --- pkgs/by-name/at/atasm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/at/atasm/package.nix b/pkgs/by-name/at/atasm/package.nix index 375565927900..05afee43d7a7 100644 --- a/pkgs/by-name/at/atasm/package.nix +++ b/pkgs/by-name/at/atasm/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "atasm"; - version = "1.27"; + version = "1.28"; src = fetchFromGitHub { owner = "CycoPH"; repo = "atasm"; rev = "V${version}"; - hash = "sha256-owr0mqib3zXMYcYliseCIkHp41nevpIPCC6nTqouAkA="; + hash = "sha256-9hDY+DQ2qA6zgVMCfvXW7QErH+eL1TKya4PpQ3vHQLQ="; }; makefile = "Makefile"; From 5e9410da7124f54941c9907c9a10adc40511ff5c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 May 2025 20:57:03 +0000 Subject: [PATCH 22/93] dblab: 0.31.0 -> 0.32.0 --- pkgs/by-name/db/dblab/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/db/dblab/package.nix b/pkgs/by-name/db/dblab/package.nix index 8fdf92ede345..ab3e084f4a0d 100644 --- a/pkgs/by-name/db/dblab/package.nix +++ b/pkgs/by-name/db/dblab/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "dblab"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "danvergara"; repo = "dblab"; rev = "v${version}"; - hash = "sha256-ssxfKIHbhiekZFONRDFzb38mEKVgEKXEq4TIyj8FXjU="; + hash = "sha256-Hcwuh+NGHp1nb6dS1CDC+M7onlNpJbkb6UAiC4j3ZiU="; }; vendorHash = "sha256-WxIlGdd3Si3Lyf9FZOCAepDlRo2F3EDRy00EawkZATY="; From 0314d9e59e94434af3d00c0b43baa101f138e4ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 May 2025 21:10:32 +0000 Subject: [PATCH 23/93] sonarlint-ls: 3.20.1.76068 -> 3.21.0.76098 --- pkgs/by-name/so/sonarlint-ls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/sonarlint-ls/package.nix b/pkgs/by-name/so/sonarlint-ls/package.nix index bbc552e6eeae..f2f27d4d0010 100644 --- a/pkgs/by-name/so/sonarlint-ls/package.nix +++ b/pkgs/by-name/so/sonarlint-ls/package.nix @@ -16,17 +16,17 @@ maven.buildMavenPackage rec { pname = "sonarlint-ls"; - version = "3.20.1.76068"; + version = "3.21.0.76098"; src = fetchFromGitHub { owner = "SonarSource"; repo = "sonarlint-language-server"; rev = version; - hash = "sha256-sM0/L6li314/j//hTDpSKr+XimWY5EZiC1d0CVKoWmw="; + hash = "sha256-5SBdLaebf0AKyFKDpaSEEIzEr00ZqLHYWfh+P4WaWus="; }; mvnJdk = jdk17; - mvnHash = "sha256-aF2lQhed7EN6l3Nwu90x3b4mzwfXyZNCYE8fLMU1Ln0="; + mvnHash = "sha256-/UM84Pvs/e3C8joa8Ti0Ponwjuaby7vVH8iiagJRcqI="; # Disables failing tests which either need network access or are flaky. mvnParameters = lib.escapeShellArgs [ From 7a02c2d3e63b12221053a25f14efb8e078de688b Mon Sep 17 00:00:00 2001 From: dish Date: Fri, 2 May 2025 17:59:59 -0400 Subject: [PATCH 24/93] poptracker: 0.30.1 -> 0.31.0 --- pkgs/by-name/po/poptracker/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/poptracker/package.nix b/pkgs/by-name/po/poptracker/package.nix index 2f0d884d087f..285f106a6648 100644 --- a/pkgs/by-name/po/poptracker/package.nix +++ b/pkgs/by-name/po/poptracker/package.nix @@ -8,6 +8,7 @@ SDL2_image, libX11, openssl, + zlib, which, libsForQt5, makeWrapper, @@ -18,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "poptracker"; - version = "0.30.1"; + version = "0.31.0"; src = fetchFromGitHub { owner = "black-sliver"; repo = "PopTracker"; rev = "v${finalAttrs.version}"; - hash = "sha256-U1C0vwHcUfjBPGLcmmWFqaKmIMPlV/FumIbFJ6JDBFc="; + hash = "sha256-uGzgkXOXmpByXewDuo0NieXHYT6fzaHqyfP60V5fMOY="; fetchSubmodules = true; }; @@ -50,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2_image libX11 openssl + zlib ]; buildFlags = [ From 85e461e1159b8512fff18744a83ba46806e91bcc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 May 2025 22:18:52 +0000 Subject: [PATCH 25/93] cnquery: 11.51.1 -> 11.52.0 --- pkgs/by-name/cn/cnquery/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix index cc9f47319d38..235de1f4d6ca 100644 --- a/pkgs/by-name/cn/cnquery/package.nix +++ b/pkgs/by-name/cn/cnquery/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cnquery"; - version = "11.51.1"; + version = "11.52.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; tag = "v${version}"; - hash = "sha256-Vc6ucWZf/n/joscFEVuQEfsg2fu860thmlppVItFDnE="; + hash = "sha256-Agc8as9PwN9IDeV0tBOPFL2tXYXYaJsa1sd+XXQ7p0k="; }; subPackages = [ "apps/cnquery" ]; From 3d8eddc934d05cbfca1194a24d48a5b3a724060a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 May 2025 22:23:15 +0000 Subject: [PATCH 26/93] ansible-lint: 25.2.1 -> 25.4.0 --- pkgs/by-name/an/ansible-lint/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/an/ansible-lint/package.nix b/pkgs/by-name/an/ansible-lint/package.nix index 0b730c94d4d1..6a7cf6d2ae9d 100644 --- a/pkgs/by-name/an/ansible-lint/package.nix +++ b/pkgs/by-name/an/ansible-lint/package.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "ansible-lint"; - version = "25.2.1"; + version = "25.4.0"; pyproject = true; src = fetchPypi { inherit version; pname = "ansible_lint"; - hash = "sha256-7Esfz6i+8T9Uf+76IupoZN79kCs6Jn749MU0GXb0X/E="; + hash = "sha256-8vKzGtGZklsjQ/ZgVS+5Rolw8WwsXVfan+rnDsTuyn0="; }; postPatch = '' From 5b19ff72b01fb9bdb43a50c640aa21a37a018f9d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 May 2025 22:36:24 +0000 Subject: [PATCH 27/93] git-spice: 0.12.0 -> 0.13.0 --- pkgs/by-name/gi/git-spice/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/git-spice/package.nix b/pkgs/by-name/gi/git-spice/package.nix index 5f0667366036..1305f143527f 100644 --- a/pkgs/by-name/gi/git-spice/package.nix +++ b/pkgs/by-name/gi/git-spice/package.nix @@ -10,16 +10,16 @@ buildGo124Module rec { pname = "git-spice"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "abhinav"; repo = "git-spice"; tag = "v${version}"; - hash = "sha256-ew0ehaYXJgc1ePdQCxxfahBdTs5zsiHDfB4SdS2WZ8A="; + hash = "sha256-hqdU0j7H3hhhjGV4lmluG1D6NXNqI80d9gGr5KJ9D+Q="; }; - vendorHash = "sha256-jlCNcjACtms9kI4Lo8AtUfxqODyv4U2nJITGpBNxk9I="; + vendorHash = "sha256-Wi/NNqHnHrfikO0EWDXNdTjPmgHrGSs2k612c0w8OA8="; subPackages = [ "." ]; From b3eb46d5515d00f7eea456d7442c0b9067a25c2f Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sat, 3 May 2025 08:28:42 +0900 Subject: [PATCH 28/93] python312Packages.jh2: 5.0.8 -> 5.0.9 Diff: https://github.com/jawah/h2/compare/refs/tags/v5.0.8...refs/tags/v5.0.9 Changelog: https://github.com/jawah/h2/blob/refs/tags/v5.0.9/CHANGELOG.rst --- pkgs/development/python-modules/jh2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jh2/default.nix b/pkgs/development/python-modules/jh2/default.nix index 5b85e75d12aa..c5023de79ef2 100644 --- a/pkgs/development/python-modules/jh2/default.nix +++ b/pkgs/development/python-modules/jh2/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "jh2"; - version = "5.0.8"; + version = "5.0.9"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,14 +21,14 @@ buildPythonPackage rec { owner = "jawah"; repo = "h2"; tag = "v${version}"; - hash = "sha256-dQ0FqiX9IqgF8fz0JDWQSHQrr9H3UwG9+mkZI3DwWSU="; + hash = "sha256-PA2hv+PIqcsvAIh8yIoQjol+Iaa3qsNRE8rBnR4UOzY="; fetchSubmodules = true; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-P27BIsloNsHHej8qE8EDtXLVvnUmWcbb/6LhP2w7wrw="; + hash = "sha256-CW95omstpWm76TTSKsb04iChU0EW1Vl+OA3QXxfZAX0="; }; build-system = [ From b79668449c128a7a6b447c7a05e2b722dee09bea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 May 2025 01:42:13 +0000 Subject: [PATCH 29/93] python3Packages.tskit: 0.6.2 -> 0.6.3 --- pkgs/development/python-modules/tskit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tskit/default.nix b/pkgs/development/python-modules/tskit/default.nix index 743870988c46..839df33507ce 100644 --- a/pkgs/development/python-modules/tskit/default.nix +++ b/pkgs/development/python-modules/tskit/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "tskit"; - version = "0.6.2"; + version = "0.6.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2ME+czMbliqdPDUsF2jlK6Ymh7YxZwXs7GoEVY1XVYE="; + hash = "sha256-bbo89pMhTDEF2M3c1pauDjECNmk34CmmqmXNmOcbVfI="; }; postPatch = '' From 369f509ead3766af244ad5ffcde9e738fec4d173 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 May 2025 02:57:57 +0000 Subject: [PATCH 30/93] python3Packages.cyclopts: 3.13.1 -> 3.14.2 --- pkgs/development/python-modules/cyclopts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index 2aaffcb20ef7..8219db84dc34 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cyclopts"; - version = "3.13.1"; + version = "3.14.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "BrianPugh"; repo = "cyclopts"; tag = "v${version}"; - hash = "sha256-clufN+oFw32hKhbPFhIWWjwq512WP5Vxe3cvM/wze60="; + hash = "sha256-vQTODRlHktmA+mf9Yy8ab8H+HVlQjK8MZ4XpjLHbozs="; }; build-system = [ From 3f8fd75a6e5f58ed7d5efd340da270e34f39a2ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 May 2025 03:03:00 +0000 Subject: [PATCH 31/93] python3Packages.deepl: 1.21.1 -> 1.22.0 --- pkgs/development/python-modules/deepl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deepl/default.nix b/pkgs/development/python-modules/deepl/default.nix index 31540f31fcb0..cac719c1ef94 100644 --- a/pkgs/development/python-modules/deepl/default.nix +++ b/pkgs/development/python-modules/deepl/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "deepl"; - version = "1.21.1"; + version = "1.22.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-unGvE6BU1aPNj3TTRsHA67XpVriTT+uTRZ7qwN8Ie1Q="; + hash = "sha256-6wlWjlmW3/aiwxjUCiK9Z9P88E8uwrGvmFuNS2zwlrY="; }; nativeBuildInputs = [ poetry-core ]; From 566d28de4f323dac01dd02672ce8ccdfcfc57efe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 May 2025 03:35:12 +0000 Subject: [PATCH 32/93] python3Packages.pybrowsers: 0.8.0 -> 0.9.0 --- pkgs/development/python-modules/pybrowsers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybrowsers/default.nix b/pkgs/development/python-modules/pybrowsers/default.nix index 36506c721449..bd5ddf97a43a 100644 --- a/pkgs/development/python-modules/pybrowsers/default.nix +++ b/pkgs/development/python-modules/pybrowsers/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pybrowsers"; - version = "0.8.0"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "roniemartinez"; repo = "browsers"; tag = version; - hash = "sha256-B6RZeDscM8ObtASZr3S0Ryq0XzppwUkhgRkqNeC+Slg="; + hash = "sha256-lL5oSz+T5HWxipwEaff+OM5lij3WUvuIpsVCv6dHWhk="; }; postPatch = '' From f2e1a950686fc7482a0db19b7a42ad0f076aa17f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 May 2025 05:06:48 +0000 Subject: [PATCH 33/93] python3Packages.ufo2ft: 3.4.2 -> 3.4.3 --- pkgs/development/python-modules/ufo2ft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index 943dc8b5018b..55ab61ab621a 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "ufo2ft"; - version = "3.4.2"; + version = "3.4.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-KRLkYmNSAL0s6G18ATxUa451mXinVYvDxe6zbYh3kU4="; + hash = "sha256-jGMH1VZQAUszd8uxH+3mRAfudTiOEoBXSnGOUcqPXao="; }; build-system = [ From a0526d20a74bb4be74c0f2339281fe4fb94edafb Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Sat, 3 May 2025 17:41:58 +0900 Subject: [PATCH 34/93] lunatic: 0.13.2 -> 0.13.2-unstable-2025-03-29 Diff: https://github.com/lunatic-solutions/lunatic/compare/v0.13.2...28a2f387ebf6a64ce4b87e2638812e2c032d5049 Required including https://github.com/lunatic-solutions/lunatic/commit/38c85471341cf6a317366a90e0eaf207095e788c to fix build --- pkgs/by-name/lu/lunatic/package.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/lu/lunatic/package.nix b/pkgs/by-name/lu/lunatic/package.nix index ac508ee88afc..6127ecba9e7e 100644 --- a/pkgs/by-name/lu/lunatic/package.nix +++ b/pkgs/by-name/lu/lunatic/package.nix @@ -6,21 +6,22 @@ openssl, stdenv, darwin, + unstableGitUpdater, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "lunatic"; - version = "0.13.2"; + version = "0.13.2-unstable-2025-03-29"; src = fetchFromGitHub { owner = "lunatic-solutions"; repo = "lunatic"; - rev = "v${version}"; - hash = "sha256-uMMssZaPDZn3bOtQIho+GvUCPmzRllv7eJ+SJuKaYtg="; + rev = "28a2f387ebf6a64ce4b87e2638812e2c032d5049"; + hash = "sha256-FnUYnSWarQf68jBfSlIKVZbQHJt5U93MvA6rbNJE23U="; }; useFetchCargoVendor = true; - cargoHash = "sha256-SzfM4hQW9vTTRqCAEn/EPv9mK9WlXYRFUW8pA/Gfw04="; + cargoHash = "sha256-+2koGrhM9VMLh8uO1YcaugcfmZaCP4S2twKem+y2oks="; nativeBuildInputs = [ pkg-config @@ -39,10 +40,15 @@ rustPlatform.buildRustPackage rec { "--skip=state::tests::import_filter_signature_matches" ]; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + branch = "main"; + }; + meta = with lib; { description = "Erlang inspired runtime for WebAssembly"; homepage = "https://lunatic.solutions"; - changelog = "https://github.com/lunatic-solutions/lunatic/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/lunatic-solutions/lunatic/blob/main/CHANGELOG.md"; license = with licenses; [ mit # or asl20 From 57392317be8c668bf30d016414396ec1db41c9e3 Mon Sep 17 00:00:00 2001 From: SirBerg Date: Sat, 3 May 2025 11:49:02 +0200 Subject: [PATCH 35/93] volanta: 1.10.11 -> 1.11.3 --- pkgs/by-name/vo/volanta/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vo/volanta/package.nix b/pkgs/by-name/vo/volanta/package.nix index b0bef0f92861..389b78429b2a 100644 --- a/pkgs/by-name/vo/volanta/package.nix +++ b/pkgs/by-name/vo/volanta/package.nix @@ -6,10 +6,10 @@ }: let pname = "volanta"; - version = "1.10.11"; + version = "1.11.3"; src = fetchurl { - url = "https://cdn.volanta.app/software/volanta-app/${version}-5495eec5/volanta-${version}.AppImage"; - hash = "sha256-DvAtgLe8eWG9sqxPaZGsk0CZWZci124bu2IFDU5Y1BQ="; + url = "https://cdn.volanta.app/software/volanta-app/${version}-622dc10d/volanta-${version}.AppImage"; + hash = "sha256-vplJEE+D2Yzr4fD//CdLRAYAKQp6a1RR0jZ1N46Q8xU="; }; appImageContents = appimageTools.extract { inherit pname version src; }; in From 29d7e20b5b135caebbba3390261524070938d769 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 May 2025 09:56:54 +0000 Subject: [PATCH 36/93] python3Packages.pysol-cards: 0.20.0 -> 0.22.0 --- pkgs/development/python-modules/pysol-cards/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysol-cards/default.nix b/pkgs/development/python-modules/pysol-cards/default.nix index 82cfed5d70bb..ec05ef0e8697 100644 --- a/pkgs/development/python-modules/pysol-cards/default.nix +++ b/pkgs/development/python-modules/pysol-cards/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pysol-cards"; - version = "0.20.0"; + version = "0.22.0"; format = "setuptools"; src = fetchPypi { inherit version; pname = "pysol_cards"; - hash = "sha256-0jlmFojJyvvTA+Hv0PEUjZByHja5lC+mFVOtUgoVa0E="; + hash = "sha256-xVXvXgWtQXdOdCtgPObmunbl0BPd9K4Iej2HxVJ58UI="; }; propagatedBuildInputs = [ From 40a890e7dfd6bc298ceecc70d9b71433453762f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 May 2025 10:25:49 +0000 Subject: [PATCH 37/93] python3Packages.pipdeptree: 2.26.0 -> 2.26.1 --- pkgs/development/python-modules/pipdeptree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index a30535f53217..f02c8c2e5e94 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.26.0"; + version = "2.26.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pipdeptree"; tag = version; - hash = "sha256-Nq+xXzi5PeDDNTtkTaMTWO4HpxkjSUptE4jwfjBoauY="; + hash = "sha256-mgmUIN49zLo5XYWW5Y9XXeZ9RurB1LekF3/vl8EDhxM="; }; postPatch = '' From 42c7df1872b83eeff6bd6ff47668f033d52570bf Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 3 May 2025 10:29:30 +0000 Subject: [PATCH 38/93] qq: 3.2.17-2025.4.23 -> 3.2.17-2025.4.29 --- pkgs/by-name/qq/qq/sources.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix index c07157d208c5..56f4838b4faa 100644 --- a/pkgs/by-name/qq/qq/sources.nix +++ b/pkgs/by-name/qq/qq/sources.nix @@ -1,9 +1,9 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2025-04-25 +# Last updated: 2025-05-03 { - version = "3.2.17-2025.4.23"; - amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.17_250423_amd64_01.deb"; - arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.17_250423_arm64_01.deb"; - arm64_hash = "sha256-BJ6WNswd9foQRD+SrJm854OiSVxREHJIv+VFe1NGnKE="; - amd64_hash = "sha256-l65Gci0wRcGuL7xqwnCng8hWdlbNC6pEaE8NaZpftM0="; + version = "3.2.17-2025.4.29"; + amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.17_250429_amd64_01.deb"; + arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.17_250429_arm64_01.deb"; + arm64_hash = "sha256-BxyJ9NNdMck3qk8wzCd07x/W9QlTMemHi3l0TIQ04ZY="; + amd64_hash = "sha256-DDqLHl8Ig7miZTheRltBq+riLXyGGnW8NtcOI0PgKtc="; } From f4e2f25693b9d5439552f52ade9731c609fd7d7e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 3 May 2025 12:47:15 +0200 Subject: [PATCH 39/93] python313Packages.publicsuffixlist: 1.0.2.20250430 -> 1.0.2.20250503 Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20250503-gha/CHANGES.md --- pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index eac763965218..3f8242db65bb 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20250430"; + version = "1.0.2.20250503"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-de7yJviyIb/R0Z93yh5LeQKpefjGsJi1YWZ/AtXwtnc="; + hash = "sha256-RHby2R/iEK7zUK4lKq+zTWKVHClZ8+zJ+EK2WxCT9Gw="; }; build-system = [ setuptools ]; From 7c4af9c822493e0878ed8b5b4479dabb9d5af9a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 May 2025 12:03:23 +0000 Subject: [PATCH 40/93] python3Packages.pytest-ansible: 25.4.0 -> 25.4.1 --- pkgs/development/python-modules/pytest-ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index fc4f414c7125..8e35b08b12ea 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pytest-ansible"; - version = "25.4.0"; + version = "25.4.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "ansible"; repo = "pytest-ansible"; tag = "v${version}"; - hash = "sha256-AX/yqxWHlLvS0K3Axhukzimi7IZYY6+IwkB9+tiqHTM="; + hash = "sha256-AJU7jGO/fN5R0ZVb/WhiXZKEZF4Z2ibhIBs+267lSSk="; }; postPatch = '' From af0e651ffa0d49542c175987fe2200b0016bbba5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 May 2025 12:26:51 +0000 Subject: [PATCH 41/93] python3Packages.mediapy: 1.2.3 -> 1.2.4 --- pkgs/development/python-modules/mediapy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mediapy/default.nix b/pkgs/development/python-modules/mediapy/default.nix index 529f021ded34..bbee510b8d6d 100644 --- a/pkgs/development/python-modules/mediapy/default.nix +++ b/pkgs/development/python-modules/mediapy/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mediapy"; - version = "1.2.3"; + version = "1.2.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-vDt5wXZ6OsCSbzShm+Ms9jhD5h3bMvBeMXOxmL65s7I="; + hash = "sha256-BSlHpnbr00kTWaaUOxRFWf3EFPdBsDoFx4+ntikeaxI="; }; nativeBuildInputs = [ flit-core ]; From 04eeb6ec05e1b3f6a7d3fe12639963dd3808cf41 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 May 2025 12:35:21 +0000 Subject: [PATCH 42/93] python3Packages.pathos: 0.3.3 -> 0.3.4 --- pkgs/development/python-modules/pathos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix index 04cc2ef55dcd..872deb560d3f 100644 --- a/pkgs/development/python-modules/pathos/default.nix +++ b/pkgs/development/python-modules/pathos/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pathos"; - version = "0.3.3"; + version = "0.3.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "uqfoundation"; repo = pname; tag = version; - hash = "sha256-J3rwnsn/3DXmChydwNC5yvsdSk1mzvPSnSo21BwkhSE="; + hash = "sha256-oVqWrX40umazNw/ET/s3pKUwvh8ctgF9sS0U8WwFQkA="; }; propagatedBuildInputs = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Parallel graph management and execution in heterogeneous computing"; homepage = "https://pathos.readthedocs.io/"; - changelog = "https://github.com/uqfoundation/pathos/releases/tag/${version}"; + changelog = "https://github.com/uqfoundation/pathos/releases/tag/${src.tag}"; license = licenses.bsd3; maintainers = [ ]; }; From 9e6b5705739fe914e8e7bc6117faa88651e90660 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 May 2025 15:11:04 +0000 Subject: [PATCH 43/93] python3Packages.scmrepo: 3.3.10 -> 3.3.11 --- pkgs/development/python-modules/scmrepo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 2a7bdf7e8863..012ddd088a50 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "3.3.10"; + version = "3.3.11"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "scmrepo"; tag = version; - hash = "sha256-BiLxILHbq5Q8iIE2yMBNlnqqFMoRe9z+Bn/FMaA7gtI="; + hash = "sha256-0vgpfUeqhol3AZuUotSbGYVyknVSxRLBwVMkcKx3m48="; }; build-system = [ @@ -57,7 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "SCM wrapper and fsspec filesystem"; homepage = "https://github.com/iterative/scmrepo"; - changelog = "https://github.com/iterative/scmrepo/releases/tag/${version}"; + changelog = "https://github.com/iterative/scmrepo/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From 5d4231e4c2f8b27626d944b1bd10a52c3994a85d Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 3 May 2025 18:30:30 +0300 Subject: [PATCH 44/93] raycast: 1.96.0 -> 1.97.0 Changelog: https://www.raycast.com/changelog/1-97-0 --- pkgs/by-name/ra/raycast/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/raycast/package.nix b/pkgs/by-name/ra/raycast/package.nix index d81453d25a56..d78cee20c01b 100644 --- a/pkgs/by-name/ra/raycast/package.nix +++ b/pkgs/by-name/ra/raycast/package.nix @@ -12,19 +12,19 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.96.0"; + version = "1.97.0"; src = { aarch64-darwin = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm"; - hash = "sha256-GN9luYvWzUsLp6KzKV+Iwc2shxRHkOLSDq6ZJaKZ7vU="; + hash = "sha256-cmaih5QYhdSNcYiVrfOkyOO+KMwClvrVkRykY6E9bQ4="; }; x86_64-darwin = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64"; - hash = "sha256-HGO6mZvnBk9R1IS8dNDGj3dwgSNJ+XPjAG4+gJ0KvY4="; + hash = "sha256-iJz3WIDh1n0ZgDgeHYZgxkysVjxJnbFF+48rzCLc4pw="; }; } .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported."); From af237645339af12993252359bd6ce76da8596e69 Mon Sep 17 00:00:00 2001 From: Davis Schirmer Date: Sat, 3 May 2025 12:58:26 -0400 Subject: [PATCH 45/93] cryptomator: 1.15.3 -> 1.16.0 https://github.com/cryptomator/cryptomator/releases/tag/1.16.0 --- pkgs/by-name/cr/cryptomator/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cr/cryptomator/package.nix b/pkgs/by-name/cr/cryptomator/package.nix index dec64a4a3229..42a4c1827c17 100644 --- a/pkgs/by-name/cr/cryptomator/package.nix +++ b/pkgs/by-name/cr/cryptomator/package.nix @@ -17,18 +17,18 @@ let in maven.buildMavenPackage rec { pname = "cryptomator"; - version = "1.15.3"; + version = "1.16.0"; src = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator"; tag = version; - hash = "sha256-3HGSeTUzfcXuNFxPuhkQBQ8CTEvgrNjpFtqOuluCeRs="; + hash = "sha256-v4UCNUbnCCccwmRMtHbN8BEHlzLcAcJ9HIU5Ak94FS8="; }; mvnJdk = jdk; mvnParameters = "-Dmaven.test.skip=true -Plinux"; - mvnHash = "sha256-vC2ULlBm/170ElcQC898N4kmWfuWwb7hFpF1oMIukyQ="; + mvnHash = "sha256-EmCuAn3waCDkngGca8f5ccV5aNTpE+fiNM6VbAS1D3w="; preBuild = '' VERSION=${version} From 10c87907f4f45afa3db5ec594809cca08b0691b8 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sat, 3 May 2025 09:58:48 -0700 Subject: [PATCH 46/93] saleae-logic-2: 2.4.22 -> 2.4.29 --- pkgs/by-name/sa/saleae-logic-2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sa/saleae-logic-2/package.nix b/pkgs/by-name/sa/saleae-logic-2/package.nix index 037a299a2054..329acb4ac709 100644 --- a/pkgs/by-name/sa/saleae-logic-2/package.nix +++ b/pkgs/by-name/sa/saleae-logic-2/package.nix @@ -6,10 +6,10 @@ }: let pname = "saleae-logic-2"; - version = "2.4.22"; + version = "2.4.29"; src = fetchurl { url = "https://downloads2.saleae.com/logic2/Logic-${version}-linux-x64.AppImage"; - hash = "sha256-MMuuSYOVw4O/JDsXz9OneUyJMNLUUCBpAMRqCs64khk="; + hash = "sha256-eCG2Al6MmWTCiYtaO6qIoNji4QreMryoZRcfKjk5d1c="; }; desktopItem = makeDesktopItem { name = "saleae-logic-2"; From 51f7c5db61152f0e6ced237772bbcccf7f87f9cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 May 2025 18:10:04 +0000 Subject: [PATCH 47/93] python3Packages.linode-api: 5.29.0 -> 5.29.1 --- pkgs/development/python-modules/linode-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix index 5e6825cf64e6..d299318d0fac 100644 --- a/pkgs/development/python-modules/linode-api/default.nix +++ b/pkgs/development/python-modules/linode-api/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "linode-api"; - version = "5.29.0"; + version = "5.29.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "linode"; repo = "python-linode-api"; tag = "v${version}"; - hash = "sha256-9dDEEjY9ajh/eMuXTLkLVSGb38TOi3RDmRIf2vKknkI="; + hash = "sha256-orMQr3FYyK4piazMsZmYkaZ/G/DvQOZObdtWt0wiEi4="; }; build-system = [ setuptools ]; From 4cb9600214eef703464fe117a1c58b3a9a4f8117 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 May 2025 18:12:33 +0000 Subject: [PATCH 48/93] python3Packages.pydmd: 2025.04.01 -> 2025.05.01 --- pkgs/development/python-modules/pydmd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pydmd/default.nix b/pkgs/development/python-modules/pydmd/default.nix index 1e390e8cf6c9..5e6497df2805 100644 --- a/pkgs/development/python-modules/pydmd/default.nix +++ b/pkgs/development/python-modules/pydmd/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "pydmd"; - version = "2025.04.01"; + version = "2025.05.01"; pyproject = true; src = fetchFromGitHub { From 4f7686acce2cb565f831f2a3321041179e7aa6e3 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Thu, 1 May 2025 00:36:54 +0200 Subject: [PATCH 49/93] azmq: unstable-2023-03-23 -> 1.0.3-unstable-2025-01-19 --- pkgs/by-name/az/azmq/package.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azmq/package.nix b/pkgs/by-name/az/azmq/package.nix index dae49a64b758..9083b28085bc 100644 --- a/pkgs/by-name/az/azmq/package.nix +++ b/pkgs/by-name/az/azmq/package.nix @@ -7,17 +7,18 @@ ninja, zeromq, catch2, + unstableGitUpdater, }: stdenv.mkDerivation { pname = "azmq"; - version = "unstable-2023-03-23"; + version = "1.0.3-unstable-2025-01-19"; src = fetchFromGitHub { owner = "zeromq"; repo = "azmq"; - rev = "2c1adac46bced4eb74ed9be7c74563bb113eaacf"; - hash = "sha256-4o1CHlg9kociIL6QN/kU2cojPvFRhtjFmKIAz0dapUM="; + rev = "4e8f18bf3ac60f5c8126db61e48927ea19a88195"; + hash = "sha256-0TYZvQefoW77RXhQ57niXs3Kcz2YHW9cBDNGFU47BBs="; }; nativeBuildInputs = [ @@ -34,6 +35,10 @@ stdenv.mkDerivation { # Broken for some reason on this platform. doCheck = !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux); + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; + meta = with lib; { homepage = "https://github.com/zeromq/azmq"; license = licenses.boost; From f1734abc898a6b3fa143644bf6e30e0e7da47862 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Thu, 1 May 2025 00:36:54 +0200 Subject: [PATCH 50/93] azmq: pin to boost 1.83 --- pkgs/by-name/az/azmq/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/az/azmq/package.nix b/pkgs/by-name/az/azmq/package.nix index 9083b28085bc..85bd155514f2 100644 --- a/pkgs/by-name/az/azmq/package.nix +++ b/pkgs/by-name/az/azmq/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - boost, + boost183, cmake, ninja, zeromq, @@ -27,7 +27,7 @@ stdenv.mkDerivation { ]; buildInputs = [ - boost + boost183 catch2 zeromq ]; From 5aec40e144a58be70422c1e0c186b73fab96941c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 May 2025 01:07:03 +0000 Subject: [PATCH 51/93] dolt: 1.52.2 -> 1.52.3 --- pkgs/by-name/do/dolt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix index 2200b22cabda..ab246c0057cf 100644 --- a/pkgs/by-name/do/dolt/package.nix +++ b/pkgs/by-name/do/dolt/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.52.2"; + version = "1.52.3"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-bEF85lWebcpwz3rYEMqA4h0eMS5AzvuzDTXIrs0izJs="; + sha256 = "sha256-c+7WWFaELEbWxgqHNDXOIt/PvielfMFbzwURlqXSZAY="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-wMnFzeZG2eBTddZt3abT4Q+X2getjcyd7JHmhywtyWs="; + vendorHash = "sha256-OYgxlEU84BDqVqfmvgBZ5blT6ySHLZcmKbVm4Bvj8Yk="; proxyVendor = true; doCheck = false; From f5a2950171e72d3f9e700aeea57354846bdca1a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 May 2025 01:08:21 +0000 Subject: [PATCH 52/93] freshrss: 1.26.1 -> 1.26.2 --- pkgs/servers/web-apps/freshrss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix index f6cc8c6fead6..47fd945d0e05 100644 --- a/pkgs/servers/web-apps/freshrss/default.nix +++ b/pkgs/servers/web-apps/freshrss/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "FreshRSS"; - version = "1.26.1"; + version = "1.26.2"; src = fetchFromGitHub { owner = "FreshRSS"; repo = "FreshRSS"; rev = version; - hash = "sha256-hgkFNZg+A1cF+xh17d2n4SCvxTZm/Eryj6jP7MvnpTE="; + hash = "sha256-TVtyX0/HKtLHFjHHjZDwOOcbHJ7Bq0NrlI3drlm6Gy4="; }; postPatch = '' From 20c1a881d99b41ffee3e9bfced64d39cef2501cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 May 2025 01:58:30 +0000 Subject: [PATCH 53/93] airwindows: 0-unstable-2025-04-19 -> 0-unstable-2025-04-27 --- pkgs/by-name/ai/airwindows/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix index 3c57f2618ffd..ea41dc9fbf98 100644 --- a/pkgs/by-name/ai/airwindows/package.nix +++ b/pkgs/by-name/ai/airwindows/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation { pname = "airwindows"; - version = "0-unstable-2025-04-19"; + version = "0-unstable-2025-04-27"; src = fetchFromGitHub { owner = "airwindows"; repo = "airwindows"; - rev = "9e38c7af2c4b74e4a1f138ebaccc07e5800c73b8"; - hash = "sha256-/6Z+CTrUeH3wNlwlP3aS5scYjhC0NwC0QXe+IMvphkc="; + rev = "f8a3f0d1b4ba5ad15777a7143f338731b9658d1a"; + hash = "sha256-Kdz8Q71LHeYhH+Lbgg9fhAYsC62LJLdQo5R+h9DwpXY="; }; # we patch helpers because honestly im spooked out by where those variables From 81a80f043e34ec4d0c94ecd61be9e8ec82ec1566 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 May 2025 02:36:11 +0000 Subject: [PATCH 54/93] python3Packages.pytelegrambotapi: 4.26.0 -> 4.27.0 --- .../development/python-modules/pyTelegramBotAPI/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 420e9552d283..c60adb199074 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pytelegrambotapi"; - version = "4.26.0"; + version = "4.27.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "eternnoir"; repo = "pyTelegramBotAPI"; tag = version; - hash = "sha256-y0Cs1DkbWwR3UYo+2ieRoFi0CSEKX0xwyVjRVC48efg="; + hash = "sha256-UozVUdqNxxwWTBoq7ekr8ZX5KdkvQj+SiNSwebVXblI="; }; build-system = [ hatchling ]; @@ -60,7 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation for the Telegram Bot API"; homepage = "https://github.com/eternnoir/pyTelegramBotAPI"; - changelog = "https://github.com/eternnoir/pyTelegramBotAPI/releases/tag/${version}"; + changelog = "https://github.com/eternnoir/pyTelegramBotAPI/releases/tag/${src.tag}"; license = licenses.gpl2Only; maintainers = with maintainers; [ das_j ]; }; From 9e548b45792c2747424614f2e1e8f037658b3f5a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 May 2025 04:00:26 +0000 Subject: [PATCH 55/93] ytt: 0.51.2 -> 0.52.0 --- pkgs/by-name/yt/ytt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yt/ytt/package.nix b/pkgs/by-name/yt/ytt/package.nix index d3897c818a88..e9eff0c28a3e 100644 --- a/pkgs/by-name/yt/ytt/package.nix +++ b/pkgs/by-name/yt/ytt/package.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "ytt"; - version = "0.51.2"; + version = "0.52.0"; src = fetchFromGitHub { owner = "carvel-dev"; repo = "ytt"; rev = "v${version}"; - sha256 = "sha256-vFD0CKEVbaOiETSsDQeBJV1flekvS893wPYc6iHxxRE="; + sha256 = "sha256-lFq1cdLKnNy+GaJLap2b/zhRvK8CjYPl3CQx9FKEpUc="; }; vendorHash = null; From 6d7d3a8c539269aa29e59f84ecd706573c36a931 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 May 2025 06:36:48 +0000 Subject: [PATCH 56/93] tbls: 1.85.1 -> 1.85.2 --- pkgs/by-name/tb/tbls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tb/tbls/package.nix b/pkgs/by-name/tb/tbls/package.nix index 3613e9e3cac2..d547c407651a 100644 --- a/pkgs/by-name/tb/tbls/package.nix +++ b/pkgs/by-name/tb/tbls/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.85.1"; + version = "1.85.2"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; tag = "v${version}"; - hash = "sha256-68eNqSncPwtaUi/m5ccHF+o4PGxo39a1QGtyisYesoM="; + hash = "sha256-dUOQKKtUaWIMgm2IA2qj67AuyAvL5ifXnGq6kBuj+zw="; }; - vendorHash = "sha256-hARsbsy9us/knGg6dwNgDezjas5IC6GtL7neEZbwgvo="; + vendorHash = "sha256-XIMC2976vLbvl6O2Xq9VhOLFRb/3IUgspqsrVNLofHg="; excludedPackages = [ "scripts/jsonschema" ]; From 4ee022660f5cec1fa4df9367159820f3dea0bf10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 May 2025 06:47:01 +0000 Subject: [PATCH 57/93] hugo: 0.146.7 -> 0.147.1 --- pkgs/by-name/hu/hugo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 96eb52f719c3..1b8407af73e1 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "hugo"; - version = "0.146.7"; + version = "0.147.1"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; tag = "v${finalAttrs.version}"; - hash = "sha256-I2SJh984uBwJRCMOiHxM1OKBwzbMgxoycovy4U4l6HM="; + hash = "sha256-Fj/1p75uOY+Zx9F9tBOjqa8nL1mbvVZzc3N7Js0qXgQ="; }; - vendorHash = "sha256-Ey0vN5/TbLb7p2M5zOHytl0PLCC658njoR8xZaFJyfo="; + vendorHash = "sha256-/XXYKuZNwrBx+Dr4XacDIzTrdELtXYHRjOzjhcBjoK4="; checkFlags = let From c9f3cdfd9b1505307b2afb271b7b9a8321f0c747 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 May 2025 08:50:06 +0200 Subject: [PATCH 58/93] python313Packages.pytelegrambotapi: update disabled --- pkgs/development/python-modules/pyTelegramBotAPI/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index c60adb199074..93ff870e2481 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { version = "4.27.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "eternnoir"; From 1c10b9acb86b93b3272905fc48864aa2b96f2df1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 May 2025 08:57:15 +0200 Subject: [PATCH 59/93] cdncheck: 1.1.16 -> 1.1.17 Diff: https://github.com/projectdiscovery/cdncheck/compare/refs/tags/v1.1.16...refs/tags/v1.1.17 Changelog: https://github.com/projectdiscovery/cdncheck/releases/tag/v1.1.17 --- pkgs/by-name/cd/cdncheck/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix index cb075a6737f5..87d77d27b014 100644 --- a/pkgs/by-name/cd/cdncheck/package.nix +++ b/pkgs/by-name/cd/cdncheck/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cdncheck"; - version = "1.1.16"; + version = "1.1.17"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cdncheck"; tag = "v${version}"; - hash = "sha256-7piHR6BlPz34pkgkj6cmi8OR2h2mZEF+hy8dwS+lras="; + hash = "sha256-nRnf2eLZQX878H6Em50MNkmEOTyr1KE5buGlMPE9vAE="; }; vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4="; From a16c51cf95d2049caa761cdc6fe42b48c0cf63f0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 4 May 2025 09:01:50 +0200 Subject: [PATCH 60/93] python313Packages.model-checker: 0.9.18 -> 0.9.19 --- pkgs/development/python-modules/model-checker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix index f5d14e88777d..42766f8771f2 100644 --- a/pkgs/development/python-modules/model-checker/default.nix +++ b/pkgs/development/python-modules/model-checker/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "model-checker"; - version = "0.9.18"; + version = "0.9.19"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "model_checker"; inherit version; - hash = "sha256-soOwym5oZZMLOOWTF14ZLcFX0RQcGnvC1Eg+k8qUMbo="; + hash = "sha256-OzK2TqEXujCdpOyS2qo5L8PAv8cfLLbiItD+OkzlyyI="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail From c425e9606c64d338707df4637f007a085085f7bc Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sun, 4 May 2025 10:59:46 +0200 Subject: [PATCH 61/93] python313Packages.help2man: disable broken test --- pkgs/development/python-modules/help2man/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/help2man/default.nix b/pkgs/development/python-modules/help2man/default.nix index df9398fcb265..b5ad7c39a829 100644 --- a/pkgs/development/python-modules/help2man/default.nix +++ b/pkgs/development/python-modules/help2man/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, pythonOlder, jinja2, setuptools-scm, @@ -35,6 +36,13 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = lib.optionals (pythonAtLeast "3.13") [ + # Checks the output of `help2man --help`. + # Broken since 3.13 due to changes in `argparse`. + # Upstream issue: https://github.com/Freed-Wu/help2man/issues/6 + "test_help" + ]; + pythonImportsCheck = [ "help2man" ]; meta = with lib; { From 8cc329f32491e69351fe215a26aeb714f51f47e9 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sun, 4 May 2025 11:08:33 +0200 Subject: [PATCH 62/93] python313Packages.help2man: refactor --- pkgs/development/python-modules/help2man/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/help2man/default.nix b/pkgs/development/python-modules/help2man/default.nix index b5ad7c39a829..134e0429e842 100644 --- a/pkgs/development/python-modules/help2man/default.nix +++ b/pkgs/development/python-modules/help2man/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, pythonAtLeast, - pythonOlder, jinja2, setuptools-scm, shtab, @@ -16,8 +15,6 @@ buildPythonPackage rec { version = "0.0.9"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "Freed-Wu"; repo = "help2man"; @@ -25,14 +22,14 @@ buildPythonPackage rec { hash = "sha256-BIDn+LQzBtDHUtFvIRL3NMXNouO3cMLibuYBoFtCUxI="; }; - nativeBuildInputs = [ + build-system = [ jinja2 setuptools-scm shtab tomli ]; - propagatedBuildInputs = [ jinja2 ]; + dependencies = [ jinja2 ]; nativeCheckInputs = [ pytestCheckHook ]; From c5eff9cd2d5b9faa00a6640bcd4506345290afbf Mon Sep 17 00:00:00 2001 From: pinpox Date: Sun, 4 May 2025 11:40:27 +0200 Subject: [PATCH 63/93] framework-tool: 0.2.1 -> 0.4.0 --- pkgs/by-name/fr/framework-tool/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/framework-tool/package.nix b/pkgs/by-name/fr/framework-tool/package.nix index e57a58ab5b28..da441f7839d3 100644 --- a/pkgs/by-name/fr/framework-tool/package.nix +++ b/pkgs/by-name/fr/framework-tool/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "framework-tool"; - version = "0.2.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "FrameworkComputer"; repo = "framework-system"; tag = "v${version}"; - hash = "sha256-wWattGkBn8WD3vfThlQnotQB4Q/C00AZT1BesoHcCyg="; + hash = "sha256-JPIpaAfXraqU6YM31bLImeJUCD3/O+PLcaZBxUjDqlM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-kmrgtYXo2Xh4mBk64VE83UJdITHgA/y3VeBRE8gDUTY="; + cargoHash = "sha256-Kf3DXEDpCbbixUjeyBi1xkR32sW2uuasxqeWeq/X2Xk="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; From 2f115627d4d869b0b156c86ea9723d78371af6af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 May 2025 11:32:10 +0000 Subject: [PATCH 64/93] nushellPlugins.highlight: 1.4.4+0.103.0 -> 1.4.5+0.104.0 --- pkgs/shells/nushell/plugins/highlight.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/plugins/highlight.nix b/pkgs/shells/nushell/plugins/highlight.nix index d78b8007bd82..aeb112857ab6 100644 --- a/pkgs/shells/nushell/plugins/highlight.nix +++ b/pkgs/shells/nushell/plugins/highlight.nix @@ -11,18 +11,18 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_highlight"; - version = "1.4.4+0.103.0"; + version = "1.4.5+0.104.0"; src = fetchFromGitHub { repo = "nu-plugin-highlight"; owner = "cptpiepmatz"; rev = "refs/tags/v${version}"; - hash = "sha256-XxYsxoHeRhZ4A52ctyJZVqJ40J3M3R42NUetZZIbk0w="; + hash = "sha256-B2CkdftlxczA6KHJsNmbPH7Grzq4MG7r6CRMvVTMkzQ="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-y0SCpDU1GM5JrixOffP1DRGtaXZsBjr7fYgYxhn4NDg="; + cargoHash = "sha256-3bLATtK9r4iVpxdbg5eCvzeGpIqWMl/GTDGCORuQfgY="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ From 84a5754e4908ff93ae70d507cd55972a525759a2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 4 May 2025 13:43:10 +0200 Subject: [PATCH 65/93] invidious: 2.20250314.0 -> 2.20250504.0 Changelog: https://github.com/iv-org/invidious/releases/tag/v2.20250504.0 Diff: https://github.com/iv-org/invidious/compare/v2.20250314.0...v2.20250504.0 --- pkgs/by-name/in/invidious/versions.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/in/invidious/versions.json b/pkgs/by-name/in/invidious/versions.json index dec7874def98..dfd283f577de 100644 --- a/pkgs/by-name/in/invidious/versions.json +++ b/pkgs/by-name/in/invidious/versions.json @@ -1,11 +1,11 @@ { "invidious": { - "hash": "sha256-OBD1QBzLPWZUz2PrMbwpjaH4bnirTkbm4HlCK4UZUbE=", - "version": "2.20250314.0", - "date": "2025.03.14", - "commit": "e23d0d1" + "hash": "sha256-JXcj5mh0WEetTt91cA+/pgqxNwyIRF+bISOBoHHVZf0=", + "version": "2.20250504.0", + "date": "2025.05.04", + "commit": "aa7de1ed" }, "videojs": { - "hash": "sha256-jED3zsDkPN8i6GhBBJwnsHujbuwlHdsVpVqa1/pzSH4" + "hash": "sha256-jED3zsDkPN8i6GhBBJwnsHujbuwlHdsVpVqa1/pzSH4=" } } From 531345b73cc4136261a744150ede469fa657f72d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 May 2025 11:49:44 +0000 Subject: [PATCH 66/93] melange: 0.23.9 -> 0.23.11 --- pkgs/by-name/me/melange/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/melange/package.nix b/pkgs/by-name/me/melange/package.nix index c0189fbc042d..295f69f78e91 100644 --- a/pkgs/by-name/me/melange/package.nix +++ b/pkgs/by-name/me/melange/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "melange"; - version = "0.23.9"; + version = "0.23.11"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-HJNB3SCy54v9Tvc6qXT3jisWcqhUCT0evjJxjCltazc="; + hash = "sha256-HMFCvewIBnqugIAi4tYnoLBp2Czk74D4kzfdRD5Aocw="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -26,7 +26,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-uxEQR6NuNJDtjXY5nPBkVU/1ExpdvTGOIpMTRjz68I8="; + vendorHash = "sha256-Kfs6f4aB+5SrqVVAsbuZm2i3TCWa00PwLMnInHmpPAs="; subPackages = [ "." ]; From ae04eb3b48ed21bcc91e4d082bebb42f24ea105a Mon Sep 17 00:00:00 2001 From: LoCrealloc Date: Sun, 4 May 2025 13:33:08 +0200 Subject: [PATCH 67/93] bagels: init at 0.3.8 --- pkgs/by-name/ba/bagels/package.nix | 100 +++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 pkgs/by-name/ba/bagels/package.nix diff --git a/pkgs/by-name/ba/bagels/package.nix b/pkgs/by-name/ba/bagels/package.nix new file mode 100644 index 000000000000..02fdb79568bd --- /dev/null +++ b/pkgs/by-name/ba/bagels/package.nix @@ -0,0 +1,100 @@ +{ + lib, + python3Packages, + fetchFromGitHub, +}: + +python3Packages.buildPythonApplication rec { + pname = "bagels"; + version = "0.3.8"; + pyproject = true; + + src = fetchFromGitHub { + owner = "EnhancedJax"; + repo = "bagels"; + tag = version; + hash = "sha256-dmBu0HSRGs4LmJY2PHNlRf0RdodmN+ZM0brwuiNmPyU="; + }; + + build-system = with python3Packages; [ + hatchling + ]; + + pythonRelaxDeps = [ + "aiohappyeyeballs" + "aiohttp" + "aiosignal" + "attrs" + "blinker" + "click" + "multidict" + "platformdirs" + "propcache" + "pydantic-core" + "pydantic" + "pygments" + "requests" + "rich" + "sqlalchemy" + "textual" + "typing-extensions" + "werkzeug" + "yarl" + ]; + + dependencies = with python3Packages; [ + aiohappyeyeballs + aiohttp-jinja2 + aiohttp + aiosignal + annotated-types + attrs + blinker + click-default-group + click + frozenlist + idna + itsdangerous + linkify-it-py + markdown-it-py + markupsafe + mdit-py-plugins + mdurl + msgpack + multidict + numpy + packaging + platformdirs + plotext + propcache + pydantic-core + pydantic + pygments + python-dateutil + pyyaml + requests + rich + sqlalchemy + textual + tomli + typing-extensions + uc-micro-py + werkzeug + xdg-base-dirs + yarl + ]; + + meta = { + homepage = "https://github.com/EnhancedJax/Bagels"; + description = "Powerful expense tracker that lives in your terminal."; + longDescription = '' + Bagels expense tracker is a TUI application where you can track and analyse your money flow, with convenience oriented features and a complete interface. + ''; + changelog = "https://github.com/EnhancedJax/Bagels/releases/tag/${version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + loc + ]; + mainProgram = "bagels"; + }; +} From c3b6a251e54d13fd6c589c86f3236988c183d683 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Sun, 4 May 2025 20:32:33 +0800 Subject: [PATCH 68/93] lipo-go: use finalAttrs style --- pkgs/by-name/li/lipo-go/package.nix | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/li/lipo-go/package.nix b/pkgs/by-name/li/lipo-go/package.nix index bb57a067071e..3375419968d6 100644 --- a/pkgs/by-name/li/lipo-go/package.nix +++ b/pkgs/by-name/li/lipo-go/package.nix @@ -2,37 +2,26 @@ lib, buildGoModule, fetchFromGitHub, - ast-grep, versionCheckHook, nix-update-script, lipo-go, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "lipo-go"; version = "0.10.0"; src = fetchFromGitHub { owner = "konoui"; repo = "lipo"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-V1KlgCNKvxnY/B8cmiWFdXzHH6k6VmhNMIta3nckXtA="; }; vendorHash = "sha256-7M6CRxJd4fgYQLJDkNa3ds3f7jOp3dyloOZtwMtCBQk="; - nativeBuildInputs = [ ast-grep ]; - - postPatch = - # Remove the test case that is not compatible with nix-build - '' - ast-grep run \ - --pattern 'func TestLipo_ArchsToLocalFiles($$$) { $$$ }' \ - --rewrite "" \ - pkg/lipo/archs_test.go - ''; buildPhase = '' runHook preBuild - make build VERSION=${version} REVISION="" BINARY=$out/bin/lipo + make build VERSION=${finalAttrs.version} REVISION="" BINARY=$out/bin/lipo runHook postBuild ''; @@ -44,16 +33,14 @@ buildGoModule rec { versionCheckProgramArg = "-version"; doInstallCheck = true; - passthru = { - updateScript = nix-update-script { }; - }; + passthru.updateScript = nix-update-script { }; meta = { description = "Designed to be compatible with macOS lipo, written in golang"; homepage = "https://github.com/konoui/lipo"; - changelog = "https://github.com/konoui/lipo/releases/tag/v${version}"; + changelog = "https://github.com/konoui/lipo/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ xiaoxiangmoe ]; mainProgram = "lipo"; }; -} +}) From a21a07fb81fcb51d3f9f452e59eace5a3b895d10 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 4 May 2025 20:45:45 +0800 Subject: [PATCH 69/93] marker: fix incompatible pointer type --- ...atible_pointer_in_marker_window_init.patch | 25 +++++++++++++++++++ pkgs/by-name/ma/marker/package.nix | 5 ++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/by-name/ma/marker/fix_incompatible_pointer_in_marker_window_init.patch diff --git a/pkgs/by-name/ma/marker/fix_incompatible_pointer_in_marker_window_init.patch b/pkgs/by-name/ma/marker/fix_incompatible_pointer_in_marker_window_init.patch new file mode 100644 index 000000000000..0421e8ff4ef6 --- /dev/null +++ b/pkgs/by-name/ma/marker/fix_incompatible_pointer_in_marker_window_init.patch @@ -0,0 +1,25 @@ +From 92a679e02f08eef8e2f8c91371b7a3a1f95b4bbc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tomi=20L=C3=A4hteenm=C3=A4ki?= +Date: Fri, 25 Apr 2025 22:04:10 +0300 +Subject: [PATCH] Fix incompatible pointer in marker_window_init() + +The `g_action_group_activate_action()` takes `GActionGroup` as first parameter. + +This fixes compilation with `-Wincompatible-pointer-types`. +--- + src/marker-window.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/marker-window.c b/src/marker-window.c +index 0ffd0ce3..98b2fdc5 100644 +--- a/src/marker-window.c ++++ b/src/marker-window.c +@@ -866,7 +866,7 @@ marker_window_init (MarkerWindow *window) + if (marker_prefs_get_show_sidebar()) + { + // show sidebar and set the "Sidebar" button as activated +- g_action_group_activate_action(G_ACTION_MAP (window), "sidebar", NULL); ++ g_action_group_activate_action(G_ACTION_GROUP (window), "sidebar", NULL); + } + g_signal_connect(window, "delete-event", G_CALLBACK(window_deleted_event_cb), window); + diff --git a/pkgs/by-name/ma/marker/package.nix b/pkgs/by-name/ma/marker/package.nix index 2a5165da2b3b..990f016b9311 100644 --- a/pkgs/by-name/ma/marker/package.nix +++ b/pkgs/by-name/ma/marker/package.nix @@ -26,6 +26,11 @@ stdenv.mkDerivation rec { hash = "sha256-HhDhigQ6Aqo8R57Yrf1i69sM0feABB9El5R5OpzOyB0="; }; + patches = [ + # https://github.com/fabiocolacio/Marker/pull/427 + ./fix_incompatible_pointer_in_marker_window_init.patch + ]; + nativeBuildInputs = [ itstool meson From 2e99f9c2c2681b12204ec6b242dcd54b95a85552 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 4 May 2025 13:01:32 +0000 Subject: [PATCH 70/93] discord: 0.0.91 -> 0.0.93 --- .../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 93f7a700a68e..d20261aec42a 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -9,7 +9,7 @@ let versions = if stdenv.hostPlatform.isLinux then { - stable = "0.0.91"; + stable = "0.0.93"; ptb = "0.0.136"; canary = "0.0.649"; development = "0.0.73"; @@ -26,7 +26,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-vGRK1YJoaM4+tUaQd4f7ImaVnUkAdjH+RW7r+bOMx6I="; + hash = "sha256-/CTgRWMi7RnsIrzWrXHE5D9zFte7GgqimxnvJTj3hFY="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; From eb7096adc978f5a240c053f6f9cb459b98399285 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 4 May 2025 13:03:18 +0000 Subject: [PATCH 71/93] discord-ptb: 0.0.136 -> 0.0.141 --- .../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 d20261aec42a..1c5250cdedb0 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -10,7 +10,7 @@ let if stdenv.hostPlatform.isLinux then { stable = "0.0.93"; - ptb = "0.0.136"; + ptb = "0.0.141"; canary = "0.0.649"; development = "0.0.73"; } @@ -30,7 +30,7 @@ let }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-7MAipSoToCTJa+QFUty88V8SXXgJJdoQfH21yCGOKvA="; + hash = "sha256-0teCE1yQLikK2MkyT8rQL1riaE9i/YGbCXw37RaRB3I="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; From 26105a8ed7ab4597df465de547b1038f2f2d02c0 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 4 May 2025 13:14:25 +0000 Subject: [PATCH 72/93] discord-canary: 0.0.649 -> 0.0.668 --- .../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 1c5250cdedb0..8ee9bcec27c6 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -11,7 +11,7 @@ let { stable = "0.0.93"; ptb = "0.0.141"; - canary = "0.0.649"; + canary = "0.0.668"; development = "0.0.73"; } else @@ -34,7 +34,7 @@ let }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-FXwnE3knSD6U6CxkewplwZJr3F8vUBDAztMDHjtV1Jw="; + hash = "sha256-1nY/g0g5C/xETO6mjaPRjjOHtVJrfcfRemAXH1KedGE="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; From c54d973e48f2c6cd6e1dbe924db15857500de31a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=A9rence=20Chateign=C3=A9?= Date: Sun, 2 Mar 2025 17:48:35 +0100 Subject: [PATCH 73/93] gowebly: init at 3.0.2 --- pkgs/by-name/go/gowebly/package.nix | 48 +++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pkgs/by-name/go/gowebly/package.nix diff --git a/pkgs/by-name/go/gowebly/package.nix b/pkgs/by-name/go/gowebly/package.nix new file mode 100644 index 000000000000..0af5a04ef766 --- /dev/null +++ b/pkgs/by-name/go/gowebly/package.nix @@ -0,0 +1,48 @@ +{ + lib, + buildGo124Module, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +buildGo124Module rec { + pname = "gowebly"; + version = "3.0.2"; + + src = fetchFromGitHub { + owner = "gowebly"; + repo = "gowebly"; + tag = "v${version}"; + hash = "sha256-QsU5Brzs3FeFkQPmpXwehP1G6MocHtCZ9uhw1lFtOEU="; + }; + + vendorHash = "sha256-wOpenKh+4v0gRY0Zvx3URi4D1jXSrIONcrlzyjJUaSg="; + + env.CGO_ENABLED = 0; + + ldflags = [ + "-s" + "-w" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "doctor"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "CLI tool to create web applications with Go backend"; + longDescription = '' + A CLI tool that makes it easy to create web applications + with Go on the backend, using htmx, hyperscript or Alpine.js, + and the most popular CSS frameworks on the frontend. + ''; + homepage = "https://gowebly.org"; + changelog = "https://github.com/gowebly/gowebly/releases/tag/v${version}"; + license = lib.licenses.asl20; + mainProgram = "gowebly"; + maintainers = with lib.maintainers; [ cterence ]; + }; +} From 0d61a96b9b8e96750d0b953183e48686fae877af Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 4 May 2025 13:18:54 +0000 Subject: [PATCH 74/93] discord-development: 0.0.73 -> 0.0.74 --- .../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 8ee9bcec27c6..f9b8da2f3603 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -12,7 +12,7 @@ let stable = "0.0.93"; ptb = "0.0.141"; canary = "0.0.668"; - development = "0.0.73"; + development = "0.0.74"; } else { @@ -38,7 +38,7 @@ let }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-zd8KpyBTdj+7jb1kRY99a48thdCRq3RNSC8oWKAQJXg="; + hash = "sha256-tF3Evi9SiGuBWJa+O9O6TpSJXiBgioZe6nmdjwcahwY="; }; }; x86_64-darwin = { From 5d983abe8c2effb4a1d7040d7bae766a43537e1b Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 4 May 2025 13:22:31 +0000 Subject: [PATCH 75/93] pkgsCross.aarch64-darwin.discord: 0.0.342 -> 0.0.344 --- .../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 f9b8da2f3603..d4b1e10c1564 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -16,7 +16,7 @@ let } else { - stable = "0.0.342"; + stable = "0.0.344"; ptb = "0.0.167"; canary = "0.0.729"; development = "0.0.85"; @@ -44,7 +44,7 @@ let x86_64-darwin = { stable = fetchurl { url = "https://stable.dl2.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-4Z/Up7KRRTaWEMUjVPi/CXbdeoEka72ZG6r3AeVmVjg="; + hash = "sha256-uKP7XSlDkK88mBUfI6Oq7PYlWqi933A99c1VqHf/ruE="; }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; From 8161422073067e92a8aee43e3ad58364338bafe8 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 4 May 2025 13:25:25 +0000 Subject: [PATCH 76/93] pkgsCross.aarch64-darwin.discord-ptb: 0.0.167 -> 0.0.171 --- .../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 d4b1e10c1564..8029b47a503f 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -17,7 +17,7 @@ let else { stable = "0.0.344"; - ptb = "0.0.167"; + ptb = "0.0.171"; canary = "0.0.729"; development = "0.0.85"; }; @@ -48,7 +48,7 @@ let }; ptb = fetchurl { url = "https://ptb.dl2.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-7ueaVb7SrD/GOVCPvf/91CaTw2jtiV/XrIsTu2RHdOM="; + hash = "sha256-TMd586LFm8B0TxxlM50MaeAtsWLuV1nlCHyYYb0sBOo="; }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; From 11a1e88dc997ec6533abb6873881b82c7cce8c43 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 4 May 2025 13:28:28 +0000 Subject: [PATCH 77/93] pkgsCross.aarch64-darwin.discord-canary: 0.0.729 -> 0.0.774 --- .../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 8029b47a503f..deadbf2f8936 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -18,7 +18,7 @@ let { stable = "0.0.344"; ptb = "0.0.171"; - canary = "0.0.729"; + canary = "0.0.774"; development = "0.0.85"; }; version = versions.${branch}; @@ -52,7 +52,7 @@ let }; canary = fetchurl { url = "https://canary.dl2.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-yP/eW1fKmZ8I5BtFOOKmmYjXlSF44HlcM8LpPNHA+Pc="; + hash = "sha256-1/1cPuz/nkxEosFNsJ557f7WiJhnOv9cFTbpSKjNtJY="; }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; From c4dfae10fe0b600122cbf0eac78c1cdcafe77bab Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 4 May 2025 13:31:35 +0000 Subject: [PATCH 78/93] pkgsCross.aarch64-darwin.discord-development: 0.0.85 -> 0.0.87 --- .../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 deadbf2f8936..b57338d8ac5e 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -19,7 +19,7 @@ let stable = "0.0.344"; ptb = "0.0.171"; canary = "0.0.774"; - development = "0.0.85"; + development = "0.0.87"; }; version = versions.${branch}; srcs = rec { @@ -56,7 +56,7 @@ let }; development = fetchurl { url = "https://development.dl2.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-Pcy2Bi3C8Jqcu4n/YLkc/7ENYRyuSf+Qj6vwN/Etqdo="; + hash = "sha256-XPHAVJjEOx+2qv+xxOCbVutrbZdPLvoTUMvRDK4nEL8="; }; }; aarch64-darwin = x86_64-darwin; From d3c6e2ca73e5e3b73b648dfdb3ff038429c36166 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 May 2025 14:21:56 +0000 Subject: [PATCH 79/93] ygot: 0.30.0 -> 0.31.0 --- pkgs/by-name/yg/ygot/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yg/ygot/package.nix b/pkgs/by-name/yg/ygot/package.nix index 4ae8cbf1015b..f142dc8819d4 100644 --- a/pkgs/by-name/yg/ygot/package.nix +++ b/pkgs/by-name/yg/ygot/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "ygot"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "openconfig"; repo = "ygot"; tag = "v${finalAttrs.version}"; - hash = "sha256-nV0vh4KZtXEMc8BNRkrRVwgb59KWahkqROxu9/7xP/E="; + hash = "sha256-jhPo3K6Q/LcfMkp2jaFwHGoFJSMdBNFidVU3A42Locw="; }; vendorHash = "sha256-MxyjO/uptmBXz+JWgRcP/SWeEWyz9pNA9eM4Rul45cM="; From b62d9a22fbab05be9b6fdb473d89fc2fd9fe4c1d Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 4 May 2025 17:05:00 +0200 Subject: [PATCH 80/93] workflows/backport: only trigger on backport labels The backport job was previously triggered on any label activity, i.e. when the backport label was already set and a new label added, the backport would have been triggered again. That's because github.event_name is actually "pull_request_target" in this case, not "closed" or "labeled" (the event's types). Thus, this part of the condition was always true. This also means that the second part, the startsWith, was never evaluated. It had its arguments flipped and would have always been false. This was introduced in #126825, but has never really worked as intended. Resolves #199556 --- .github/workflows/backport.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index bbc18fdeebea..56ee11e726b6 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -14,7 +14,7 @@ permissions: {} jobs: backport: name: Backport Pull Request - if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name)) + if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.pull_request.action != 'labeled' || startsWith(github.event.label.name, 'backport')) runs-on: ubuntu-24.04 steps: # Use a GitHub App to create the PR so that CI gets triggered From 21e58324a67c14303d35e69ad04f502685b5c2dd Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 28 Apr 2025 19:55:25 -0500 Subject: [PATCH 81/93] noti: migrate to by-name --- .../misc/noti/default.nix => by-name/no/noti/package.nix} | 4 ---- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 8 deletions(-) rename pkgs/{tools/misc/noti/default.nix => by-name/no/noti/package.nix} (92%) diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/by-name/no/noti/package.nix similarity index 92% rename from pkgs/tools/misc/noti/default.nix rename to pkgs/by-name/no/noti/package.nix index 71fb707312c9..0c983c9a7450 100644 --- a/pkgs/tools/misc/noti/default.nix +++ b/pkgs/by-name/no/noti/package.nix @@ -1,9 +1,7 @@ { - stdenv, lib, buildGoModule, fetchFromGitHub, - Cocoa, installShellFiles, }: @@ -22,8 +20,6 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin Cocoa; - ldflags = [ "-s" "-w" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf9e45fe56b7..e1ab19c26110 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2590,10 +2590,6 @@ with pkgs; nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools; - noti = callPackage ../tools/misc/noti { - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - nsz = with python3.pkgs; toPythonApplication nsz; ocrmypdf = with python3.pkgs; toPythonApplication ocrmypdf; From d57be05584651498636701873296e4b2e20e351c Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Mon, 28 Apr 2025 20:02:29 -0500 Subject: [PATCH 82/93] noti: 3.7.0 -> 3.8.0 Diff: https://github.com/variadico/noti/compare/refs/tags/3.7.0...3.8.0 Changelog: https://github.com/variadico/noti/releases/tag/3.8.0 --- pkgs/by-name/no/noti/package.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/no/noti/package.nix b/pkgs/by-name/no/noti/package.nix index 0c983c9a7450..27b8675652c0 100644 --- a/pkgs/by-name/no/noti/package.nix +++ b/pkgs/by-name/no/noti/package.nix @@ -5,25 +5,27 @@ installShellFiles, }: -buildGoModule rec { +buildGoModule (finalAttrs: rec { pname = "noti"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "variadico"; repo = "noti"; - rev = version; - hash = "sha256-8CHSbKOiWNYqKBU1kqQm5t02DJq0JfoIaPsU6Ylc46E="; + tag = finalAttrs.version; + hash = "sha256-FwOS4ifMiODIzKVQufLhkDYOcmXz9dAfWw+hM3rXT/Y="; }; vendorHash = null; nativeBuildInputs = [ installShellFiles ]; + subPackages = [ "cmd/noti" ]; + ldflags = [ "-s" "-w" - "-X github.com/variadico/noti/internal/command.Version=${version}" + "-X github.com/variadico/noti/internal/command.Version=${finalAttrs.version}" ]; preCheck = '' @@ -34,7 +36,7 @@ buildGoModule rec { installManPage docs/man/dist/* ''; - meta = with lib; { + meta = { description = "Monitor a process and trigger a notification"; longDescription = '' Monitor a process and trigger a notification. @@ -43,8 +45,8 @@ buildGoModule rec { you when it's done. You can receive messages on your computer or phone. ''; homepage = "https://github.com/variadico/noti"; - license = licenses.mit; - maintainers = with maintainers; [ stites ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.stites ]; mainProgram = "noti"; }; -} +}) From fa154d184f6aa13691ac3c9de7452c3be60844d3 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 4 May 2025 17:34:37 +0200 Subject: [PATCH 83/93] workflows/backport: add "has: port to stable" label on success This allows filtering for PRs with a backport label, but without the "has: port to stable" label to find those which need to be manually acted on. Resolves #325359 --- .github/workflows/backport.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index bbc18fdeebea..4fdf838edfce 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -33,6 +33,7 @@ jobs: token: ${{ steps.app-token.outputs.token }} - name: Create backport PRs + id: backport uses: korthout/backport-action@436145e922f9561fc5ea157ff406f21af2d6b363 # v3.2.0 with: # Config README: https://github.com/korthout/backport-action#backport-action @@ -43,3 +44,15 @@ jobs: * [ ] Before merging, ensure that this backport is [acceptable for the release](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#changes-acceptable-for-releases). * Even as a non-commiter, if you find that it is not acceptable, leave a comment. + + - name: "Add 'has: port to stable' label" + if: steps.backport.outputs.was_successful + env: + GH_TOKEN: ${{ steps.app-token.outputs.token }} + REPOSITORY: ${{ github.repository }} + NUMBER: ${{ github.event.number }} + run: | + gh api \ + --method POST \ + /repos/"$REPOSITORY"/issues/"$NUMBER"/labels \ + -f "labels[]=8.has: port to stable" From 23fe35ce9d7e72cc820d63b6696b64b6c16da8fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 2 May 2025 14:36:37 +0000 Subject: [PATCH 84/93] nuclear: 0.6.46 -> 0.6.47 --- pkgs/by-name/nu/nuclear/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nu/nuclear/package.nix b/pkgs/by-name/nu/nuclear/package.nix index f31dbe02a473..f43355122561 100644 --- a/pkgs/by-name/nu/nuclear/package.nix +++ b/pkgs/by-name/nu/nuclear/package.nix @@ -5,7 +5,7 @@ }: let pname = "nuclear"; - version = "0.6.46"; + version = "0.6.47"; src = fetchurl { # Nuclear currently only publishes AppImage releases for x86_64, which is hardcoded in @@ -13,7 +13,7 @@ let # provide more arches, we should use stdenv.hostPlatform to determine the arch and choose # source URL accordingly. url = "https://github.com/nukeop/nuclear/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage"; - hash = "sha256-2oamA2T/Fq9TpqrNFByiL+ns12BaWMy3wptYEo5SIXg="; + hash = "sha256-mwCQ6jddNF3knf1w0nztlyB/ijPsyjjV6aMcoYkadRI="; }; appimageContents = appimageTools.extract { inherit pname version src; }; From b880fdd3f59312a5ac1ec9ab412555415c326b65 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 1 May 2025 13:13:10 +0200 Subject: [PATCH 85/93] electron_36-bin: init at 36.1.0 - Changelog: https://github.com/electron/electron/releases/tag/v36.0.0 - Changelog: https://github.com/electron/electron/releases/tag/v36.0.1 - Changelog: https://github.com/electron/electron/releases/tag/v36.1.0 --- pkgs/development/tools/electron/binary/info.json | 11 +++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 13 insertions(+) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 3e2521f2d719..b0dc6b0f7458 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -31,5 +31,16 @@ "x86_64-linux": "d346f416d061f38bc53f3d57e0f01c03d0febb00199e362f7ef2e1209f93817e" }, "version": "35.2.1" + }, + "36": { + "hashes": { + "aarch64-darwin": "5f38c1939c76a6299ac68a9b5b56deea8d81f4ac02f5855a59a7aad4c3c86eef", + "aarch64-linux": "e09c83143897a2156e070689df80591e62404ed5289e6f6674fe46ccdff6f2f3", + "armv7l-linux": "69210a543ab81214c635868cf3325b58656892cf831cc91eee232cc6112b684d", + "headers": "0wz92myljv28smg20jgs59l2n9kdha99n7ch0ng1bzhavwp619jg", + "x86_64-darwin": "86eb97a6b4f800efc82910cf366e1e1c93fbc003dcb55aad5f78a0af4f0b826e", + "x86_64-linux": "088b95582140e2c9175f01df5c82a80048085acfb416bb27783bf4d0babc7eb4" + }, + "version": "36.1.0" } } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1ab19c26110..816d595b97f8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7798,6 +7798,7 @@ with pkgs; electron_33-bin electron_34-bin electron_35-bin + electron_36-bin ; inherit (callPackages ../development/tools/electron/chromedriver { }) @@ -7817,6 +7818,7 @@ with pkgs; electron-source.electron_35 else electron_35-bin; + electron_36 = electron_36-bin; electron = electron_35; electron-bin = electron_35-bin; electron-chromedriver = electron-chromedriver_35; From 20401cb20c563ab65e87fc41c726d5541e912164 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 1 May 2025 13:14:18 +0200 Subject: [PATCH 86/93] electron-chromedriver_36: init at 36.1.0 - Changelog: https://github.com/electron/electron/releases/tag/v36.0.0 - Changelog: https://github.com/electron/electron/releases/tag/v36.0.1 - Changelog: https://github.com/electron/electron/releases/tag/v36.1.0 --- .../development/tools/electron/chromedriver/info.json | 11 +++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 18b3f498d771..0344db109ec6 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -31,5 +31,16 @@ "x86_64-linux": "d1f1027d1d01a0ce6cfdf60fffa64d64ebe75d0c54e9a5acff51f1c8005f6ef4" }, "version": "35.2.1" + }, + "36": { + "hashes": { + "aarch64-darwin": "e6373639cd3d32cd105808bae06bb7d10357fb54f3ad74aa4a9bf9e9007985a6", + "aarch64-linux": "8d53627e7f69f0d573f9228d9c358f28662521ee200b674f650058deefb0c745", + "armv7l-linux": "dbe7be9ba75d76eb572da822d73487dec128ef6d5e97f6b91f5a3d7a7b52215e", + "headers": "0wz92myljv28smg20jgs59l2n9kdha99n7ch0ng1bzhavwp619jg", + "x86_64-darwin": "46bfd929e8207eccc4360070d9a8c81cab053685db1cfcfeafedd0feaa3da238", + "x86_64-linux": "de707f14b5959821e82b46c391bea6f4199878ad9c61f56c2a358dd80b45664a" + }, + "version": "36.1.0" } } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 816d595b97f8..230911d17901 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7805,6 +7805,7 @@ with pkgs; electron-chromedriver_33 electron-chromedriver_34 electron-chromedriver_35 + electron-chromedriver_36 ; electron_33 = electron_33-bin; From 8d92119c540d78599ba208010c722a60958810f4 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu, 1 May 2025 13:56:22 +0200 Subject: [PATCH 87/93] electron-source.electron_36: init at 36.1.0 - Changelog: https://github.com/electron/electron/releases/tag/v36.0.0 - Changelog: https://github.com/electron/electron/releases/tag/v36.0.1 - Changelog: https://github.com/electron/electron/releases/tag/v36.1.0 --- pkgs/development/tools/electron/common.nix | 4 + pkgs/development/tools/electron/info.json | 1325 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 +- 3 files changed, 1334 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index a6ba7db4e3c6..978d195b55ab 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -166,6 +166,10 @@ in done ) '' + + lib.optionalString (lib.versionAtLeast info.version "36") '' + echo 'checkout_glic_e2e_tests = false' >> build/config/gclient_args.gni + echo 'checkout_mutter = false' >> build/config/gclient_args.gni + '' + base.postPatch; preConfigure = diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 0015f35b807b..ec6de61a1002 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -2584,5 +2584,1330 @@ "modules": "133", "node": "22.14.0", "version": "35.2.1" + }, + "36": { + "chrome": "136.0.7103.49", + "chromium": { + "deps": { + "gn": { + "hash": "sha256-vDKMt23RMDI+KX6CmjfeOhRv2haf/mDOuHpWKnlODcg=", + "rev": "6e8e0d6d4a151ab2ed9b4a35366e630c55888444", + "url": "https://gn.googlesource.com/gn", + "version": "2025-03-24" + } + }, + "version": "136.0.7103.49" + }, + "chromium_npm_hash": "sha256-QRjk9X4rJW3ofizK33R4T1qym1riqcnpBhDF+FfNZLo=", + "deps": { + "src": { + "args": { + "hash": "sha256-7ykQd8jKE9aVfTBPrJnOGHQYhmm+gJoMX7kET7eYFXM=", + "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", + "rev": "136.0.7103.49", + "url": "https://chromium.googlesource.com/chromium/src.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/chrome/test/data/perf/canvas_bench": { + "args": { + "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=", + "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732", + "url": "https://chromium.googlesource.com/chromium/canvas_bench.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/chrome/test/data/perf/frame_rate/content": { + "args": { + "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=", + "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9", + "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/chrome/test/data/xr/webvr_info": { + "args": { + "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=", + "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248", + "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/docs/website": { + "args": { + "hash": "sha256-lY4P2f90/9JwCpxuBFjim7KygczM8zMDQVUaEYaQjnA=", + "rev": "929dd3e6d02aac1f46653d03b2a644e2873a3bbb", + "url": "https://chromium.googlesource.com/website.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/electron": { + "args": { + "hash": "sha256-A0/PXVPEtDKtLuy5oUQOyB8TsmvUWgdAGn0cq4k4+14=", + "owner": "electron", + "repo": "electron", + "rev": "v36.1.0" + }, + "fetcher": "fetchFromGitHub" + }, + "src/media/cdm/api": { + "args": { + "hash": "sha256-FgeuOsxToA4qx3H76czCPeO/WVtprRkllDMPancw3Ik=", + "rev": "5a1675c86821a48f8983842d07f774df28dfb43c", + "url": "https://chromium.googlesource.com/chromium/cdm.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/net/third_party/quiche/src": { + "args": { + "hash": "sha256-CLvZTBvtTdOpC8eWUTWkb0ITJ5EViPmc6d5O8cTaKY8=", + "rev": "5077431b183c43f10890b865fc9f02a4dcf1dd85", + "url": "https://quiche.googlesource.com/quiche.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/testing/libfuzzer/fuzzers/wasm_corpus": { + "args": { + "hash": "sha256-gItDOfNqm1tHlmelz3l2GGdiKi9adu1EpPP6U7+8EQY=", + "rev": "1df5e50a45db9518a56ebb42cb020a94a090258b", + "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/accessibility_test_framework/src": { + "args": { + "hash": "sha256-mzVgoxxBWebesG6okyMxxmO6oH+TITA4o9ucHHMMzkQ=", + "rev": "4a764c690353ea136c82f1a696a70bf38d1ef5fe", + "url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/angle": { + "args": { + "hash": "sha256-+Cgf3OocFbD2rL4izA/0Z0qjWQiIUwiTW/z0cW0pGb0=", + "rev": "ecc378cc61109732d174d6542c41fd523c331b13", + "url": "https://chromium.googlesource.com/angle/angle.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/angle/third_party/VK-GL-CTS/src": { + "args": { + "hash": "sha256-L2ewIW6C+PTftbbXf+nlWcFD0y4naBNg7FLXMMxiWac=", + "rev": "b6bb4bab7b4a36bc95566e00cb8f01051089afc3", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/angle/third_party/glmark2/src": { + "args": { + "hash": "sha256-VebUALLFKwEa4+oE+jF8mBSzhJd6aflphPmcK1Em8bw=", + "rev": "6edcf02205fd1e8979dc3f3964257a81959b80c8", + "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/angle/third_party/rapidjson/src": { + "args": { + "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", + "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f", + "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/anonymous_tokens/src": { + "args": { + "hash": "sha256-GaRtZmYqajLUpt7ToRfMLBlyMiJB5yT9BaaT9pHH7OM=", + "rev": "d708a2602a5947ee068f784daa1594a673d47c4a", + "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/beto-core/src": { + "args": { + "hash": "sha256-QPFGjtu/I0r4+dTQ2eSlWIEYwJ43B3yW0q4QtVFTVGY=", + "rev": "89563fec14c756482afa08b016eeba9087c8d1e3", + "url": "https://beto-core.googlesource.com/beto-core.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/boringssl/src": { + "args": { + "hash": "sha256-fUPl9E2b7RfanH0pZNArIkJ4lnnmCtyk7sCaTArCB70=", + "rev": "a9993612faac4866bc33ca8ff37bfd0659af1c48", + "url": "https://boringssl.googlesource.com/boringssl.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/breakpad/breakpad": { + "args": { + "hash": "sha256-9MePkv10fwyJ0VDWRtvRcbLMAcJzZlziGTPzXJYjVJE=", + "rev": "657a441e5c1a818d4c10b7bafd431454e6614901", + "url": "https://chromium.googlesource.com/breakpad/breakpad.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/cast_core/public/src": { + "args": { + "hash": "sha256-yQxm1GMMne80bLl1P7OAN3bJLz1qRNAvou2/5MKp2ig=", + "rev": "f5ee589bdaea60418f670fa176be15ccb9a34942", + "url": "https://chromium.googlesource.com/cast_core/public" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/catapult": { + "args": { + "hash": "sha256-xwR9gGE8uU8qFr7GgS3/1JiuTmj1tvcM5CoCfPMdW2M=", + "rev": "5bda0fdab9d93ec9963e2cd858c7b49ad7fec7d4", + "url": "https://chromium.googlesource.com/catapult.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/ced/src": { + "args": { + "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", + "rev": "ba412eaaacd3186085babcd901679a48863c7dd5", + "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/clang-format/script": { + "args": { + "hash": "sha256-d9uweklBffiuCWEb03ti1eFLnMac2qRtvggzXY1n/RU=", + "rev": "37f6e68a107df43b7d7e044fd36a13cbae3413f2", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/cld_3/src": { + "args": { + "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", + "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661", + "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/colorama/src": { + "args": { + "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", + "rev": "3de9f013df4b470069d03d250224062e8cf15c49", + "url": "https://chromium.googlesource.com/external/colorama.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/compiler-rt/src": { + "args": { + "hash": "sha256-bfDMglQaiExTFwaVBroia+6G+9AHEVy5cQGocaEVOgA=", + "rev": "bc2b30185219a2defe3c8a3b45f95a11386a7f6f", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/content_analysis_sdk/src": { + "args": { + "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=", + "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc", + "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/cpu_features/src": { + "args": { + "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=", + "rev": "936b9ab5515dead115606559502e3864958f7f6e", + "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/cpuinfo/src": { + "args": { + "hash": "sha256-JNLaK105qDk9DxTqCFyXFfYn46dF+nZIaF5urSVRa0U=", + "rev": "b73ae6ce38d5dd0b7fe46dbe0a4b5f4bab91c7ea", + "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/crabbyavif/src": { + "args": { + "hash": "sha256-T9ibgp0glfY5EhwMiwlvXKZat0InDu7PoqE1H8/lS5A=", + "rev": "02d0fad2c512380b7270d6e704c86521075d7d54", + "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/crc32c/src": { + "args": { + "hash": "sha256-KBraGaO5LmmPP+p8RuDogGldbTWdNDK+WzF4Q09keuE=", + "rev": "d3d60ac6e0f16780bcfcc825385e1d338801a558", + "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/cros-components/src": { + "args": { + "hash": "sha256-CT9c4LqTwhldsxoEny8MesULwQC4k95F4tfCtRZErGM=", + "rev": "97dc8c7a1df880206cc54d9913a7e9d73677072a", + "url": "https://chromium.googlesource.com/external/google3/cros_components.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/cros_system_api": { + "args": { + "hash": "sha256-pZi6GRu7OGL7jbN4FM2qDsLCsT6cM+RM0a7XtFZVSVE=", + "rev": "62ab80355a8194e051bd1d93a5c09093c7645a32", + "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/crossbench": { + "args": { + "hash": "sha256-Q0kdJdEmh+wbO5oeTp98OHKh9luz8u6PDztGToldZjk=", + "rev": "ce46be2573328fa7b0fd1d23c04b63389f298122", + "url": "https://chromium.googlesource.com/crossbench.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/dav1d/libdav1d": { + "args": { + "hash": "sha256-+DY4p41VuAlx7NvOfXjWzgEhvtpebjkjbFwSYOzSjv4=", + "rev": "8d956180934f16244bdb58b39175824775125e55", + "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/dawn": { + "args": { + "hash": "sha256-VK+5saAJlZOluMAYKTKwNcnZALsCYkzgVfQHylt3584=", + "rev": "1cffe7ec763900d104e4df62bc96d93f572157cb", + "url": "https://dawn.googlesource.com/dawn.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/dawn/third_party/dxc": { + "args": { + "hash": "sha256-WXgiOlqtczrUkXp46Q/GTaYk0LDqebQSFbyWpD299Xw=", + "rev": "206b77577d15fc5798eb7ad52290388539b7146d", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/dawn/third_party/dxheaders": { + "args": { + "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", + "rev": "980971e835876dc0cde415e8f9bc646e64667bf7", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/dawn/third_party/glfw": { + "args": { + "hash": "sha256-E1zXIDiw87badrLOZTvV+Wh9NZHu51nb70ZK9vlAlqE=", + "rev": "b35641f4a3c62aa86a0b3c983d163bc0fe36026d", + "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/dawn/third_party/khronos/EGL-Registry": { + "args": { + "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", + "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { + "args": { + "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", + "rev": "5bae8738b23d06968e7c3a41308568120943ae77", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/dawn/third_party/webgpu-cts": { + "args": { + "hash": "sha256-WTVOc2EVB/DJ4aDeB8XIF/ff6LSeEUMt2Xkvj5Hu4aU=", + "rev": "5fbd82847521cb2d584773facd56c2eb6a4df180", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/depot_tools": { + "args": { + "hash": "sha256-O9vVbrCqHD4w39Q8ZAxl1RwzJxbH/thjqacMtCnOPdg=", + "rev": "f40ddcd8d51626fb7be3ab3c418b3f3be801623f", + "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/devtools-frontend/src": { + "args": { + "hash": "sha256-BHD/XVQquh9/cr+Kv43lKGFReHy4YbQIAJq5792+4Sw=", + "rev": "e793e21a020b53a66ae13ef8673f80b8e8a73746", + "url": "https://chromium.googlesource.com/devtools/devtools-frontend" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/dom_distiller_js/dist": { + "args": { + "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", + "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d", + "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/domato/src": { + "args": { + "hash": "sha256-fYxoA0fxKe9U23j+Jp0MWj4m7RfsRpM0XjF6/yOhX1I=", + "rev": "053714bccbda79cf76dac3fee48ab2b27f21925e", + "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/eigen3/src": { + "args": { + "hash": "sha256-OJyfUyiR8PFSaWltx6Ig0RCB+LxPxrPtc0GUfu2dKrk=", + "rev": "464c1d097891a1462ab28bf8bb763c1683883892", + "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/electron_node": { + "args": { + "hash": "sha256-bJPSHe3CsL9T1SYwC8hyDbAMqj/5WvgM8VqQU9mpVww=", + "owner": "nodejs", + "repo": "node", + "rev": "v22.14.0" + }, + "fetcher": "fetchFromGitHub" + }, + "src/third_party/emoji-segmenter/src": { + "args": { + "hash": "sha256-KdQdKBBipEBRT8UmNGao6yCB4m2CU8/SrMVvcXlb5qE=", + "rev": "955936be8b391e00835257059607d7c5b72ce744", + "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/engflow-reclient-configs": { + "args": { + "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=", + "owner": "EngFlow", + "repo": "reclient-configs", + "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d" + }, + "fetcher": "fetchFromGitHub" + }, + "src/third_party/expat/src": { + "args": { + "hash": "sha256-Iwu9+i/0vsPyu6pOWFxjNNblVxMl6bTPW5eWyaju4Mg=", + "rev": "624da0f593bb8d7e146b9f42b06d8e6c80d032a3", + "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/farmhash/src": { + "args": { + "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", + "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45", + "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/fast_float/src": { + "args": { + "hash": "sha256-CG5je117WYyemTe5PTqznDP0bvY5TeXn8Vu1Xh5yUzQ=", + "rev": "cb1d42aaa1e14b09e1452cfdef373d051b8c02a4", + "url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/ffmpeg": { + "args": { + "hash": "sha256-bGa0BCvzNxEKu9VZEwJ1NLt+b2KKWUxshpKSN2FHNEM=", + "rev": "fbce2a76c00cd2e5aeffe3c2e71d44c284ec52d6", + "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/flac": { + "args": { + "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=", + "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c", + "url": "https://chromium.googlesource.com/chromium/deps/flac.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/flatbuffers/src": { + "args": { + "hash": "sha256-tbc45o0MbMvK5XqRUJt5Eg8BU6+TJqlmwFgQhHq6wRM=", + "rev": "8db59321d9f02cdffa30126654059c7d02f70c32", + "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/fontconfig/src": { + "args": { + "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00=", + "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267", + "url": "https://chromium.googlesource.com/external/fontconfig.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/fp16/src": { + "args": { + "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=", + "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/freetype-testing/src": { + "args": { + "hash": "sha256-cpzz5QDeAT3UgAZzwW7c0SgLDQsBwy/1Q+5hz2XW4lE=", + "rev": "04fa94191645af39750f5eff0a66c49c5cb2c2cc", + "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/freetype/src": { + "args": { + "hash": "sha256-LhSIX7X0+dmLADYGNclg73kIrXmjTMM++tJ92MKzanA=", + "rev": "82090e67c24259c343c83fd9cefe6ff0be7a7eca", + "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/fuzztest/src": { + "args": { + "hash": "sha256-Dz7DqucOxr5HzLNOdGNOG4iMw66bkOj64qOvqeADTic=", + "rev": "c31f0c0e6df5725c6b03124b579c9cf815fd10f4", + "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/fxdiv/src": { + "args": { + "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", + "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/gemmlowp/src": { + "args": { + "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", + "rev": "13d57703abca3005d97b19df1f2db731607a7dc2", + "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/glslang/src": { + "args": { + "hash": "sha256-nr7pGPNPMbmL/XnL27M4m5in8qnCDcpNtVsxBAc7zms=", + "rev": "e57f993cff981c8c3ffd38967e030f04d13781a9", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/google_benchmark/src": { + "args": { + "hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w=", + "rev": "761305ec3b33abf30e08d50eb829e19a802581cc", + "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/googletest/src": { + "args": { + "hash": "sha256-8keF4E6ag/rikv5ROaWUB7oganjViupEAdxW1NJVgmE=", + "rev": "52204f78f94d7512df1f0f3bea1d47437a2c3a58", + "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/harfbuzz-ng/src": { + "args": { + "hash": "sha256-/WNGrvyvJ+FGqoIoHapaux1iu63zjID0yR30HYPpxaw=", + "rev": "8efd2d85c78fbba6ca09a3e454f77525f3b296ce", + "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/highway/src": { + "args": { + "hash": "sha256-IS7m1wBwpPBUNhx2GttY1fzvmLIeAp3o2gXfrFpRdvY=", + "rev": "00fe003dac355b979f36157f9407c7c46448958e", + "url": "https://chromium.googlesource.com/external/github.com/google/highway.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/hunspell_dictionaries": { + "args": { + "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=", + "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e", + "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/icu": { + "args": { + "hash": "sha256-Omv4sp9z44eINXtaE0+1TzIU1q2hWviANA79fmkF78U=", + "rev": "c9fb4b3a6fb54aa8c20a03bbcaa0a4a985ffd34b", + "url": "https://chromium.googlesource.com/chromium/deps/icu.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/ink/src": { + "args": { + "hash": "sha256-sMqSHYs3lvuHXEov1K9xWRd8tUPG00QBJl6an0zrxwA=", + "rev": "c542d619a8959415beda5a76fe89ffa2f83df886", + "url": "https://chromium.googlesource.com/external/github.com/google/ink.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/ink_stroke_modeler/src": { + "args": { + "hash": "sha256-XMLW/m+Qx+RVgo1DeYggBLjUYg/M+2eHwgjVWrA/Erw=", + "rev": "f61f28792a00c9bdcb3489fec81d8fd0ca1cbaba", + "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/instrumented_libs": { + "args": { + "hash": "sha256-8kokdsnn5jD9KgM/6g0NuITBbKkGXWEM4BMr1nCrfdU=", + "rev": "69015643b3f68dbd438c010439c59adc52cac808", + "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/jetstream/main": { + "args": { + "hash": "sha256-DbRup4tOAYv27plzB2JKi2DBX2FVMDtFR7AzuovXUDU=", + "rev": "0260caf74b5c115507ee0adb6d9cdf6aefb0965f", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/jetstream/v2.2": { + "args": { + "hash": "sha256-zucA2tqNOsvjhwYQKZ5bFUC73ZF/Fu7KpBflSelvixw=", + "rev": "2145cedef4ca2777b792cb0059d3400ee2a6153c", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/jsoncpp/source": { + "args": { + "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", + "rev": "42e892d96e47b1f6e29844cc705e148ec4856448", + "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/leveldatabase/src": { + "args": { + "hash": "sha256-ANtMVRZmW6iOjDVn2y15ak2fTagFTTaz1Se6flUHL8w=", + "rev": "4ee78d7ea98330f7d7599c42576ca99e3c6ff9c5", + "url": "https://chromium.googlesource.com/external/leveldb.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libFuzzer/src": { + "args": { + "hash": "sha256-Lb+HczYax0T7qvC0/Nwhc5l2szQTUYDouWRMD/Qz7sA=", + "rev": "e31b99917861f891308269c36a32363b120126bb", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libaddressinput/src": { + "args": { + "hash": "sha256-6h4/DQUBoBtuGfbaTL5Te1Z+24qjTaBuIydcTV18j80=", + "rev": "2610f7b1043d6784ada41392fc9392d1ea09ea07", + "url": "https://chromium.googlesource.com/external/libaddressinput.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libaom/source/libaom": { + "args": { + "hash": "sha256-nfnt5JXyKR9JR3BflpGEkwzDo0lYa/oeCDm2bKH/j1g=", + "rev": "9680f2b1781fb33b9eeb52409b75c679c8a954be", + "url": "https://aomedia.googlesource.com/aom.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libc++/src": { + "args": { + "hash": "sha256-Ypi5fmWdoNA1IZDoKITlkNRITmho8HzVlgjlmtx0Y84=", + "rev": "449310fe2e37834a7e62972d2a690cade2ef596b", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libc++abi/src": { + "args": { + "hash": "sha256-wMMfj3E2AQJxovoSEIuT2uTyrcGBurS1HrHZOmP36+g=", + "rev": "94c5d7a8edc09f0680aee57548c0b5d400c2840d", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libdrm/src": { + "args": { + "hash": "sha256-woSYEDUfcEBpYOYnli13wLMt754A7KnUbmTEcFQdFGw=", + "rev": "ad78bb591d02162d3b90890aa4d0a238b2a37cde", + "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libgav1/src": { + "args": { + "hash": "sha256-BgTfWmbcMvJB1KewJpRcMtbOd2FVuJ+fi1zAXBXfkrg=", + "rev": "c05bf9be660cf170d7c26bd06bb42b3322180e58", + "url": "https://chromium.googlesource.com/codecs/libgav1.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libipp/libipp": { + "args": { + "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=", + "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f", + "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libjpeg_turbo": { + "args": { + "hash": "sha256-Ig+tmprZDvlf/M72/DTar2pbxat9ZElgSqdXdoM0lPs=", + "rev": "e14cbfaa85529d47f9f55b0f104a579c1061f9ad", + "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/liblouis/src": { + "args": { + "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", + "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376", + "url": "https://chromium.googlesource.com/external/liblouis-github.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libphonenumber/dist": { + "args": { + "hash": "sha256-ZbuDrZEUVp/ekjUP8WO/FsjAomRjeDBptT4nQZvTVi4=", + "rev": "9d46308f313f2bf8dbce1dfd4f364633ca869ca7", + "url": "https://chromium.googlesource.com/external/libphonenumber.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libprotobuf-mutator/src": { + "args": { + "hash": "sha256-EaEC6R7SzqLw4QjEcWXFXhZc84lNBp6RSa9izjGnWKE=", + "rev": "7bf98f78a30b067e22420ff699348f084f802e12", + "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libsrtp": { + "args": { + "hash": "sha256-bkG1+ss+1a2rCHGwZjhvf5UaNVbPPZJt9HZSIPBKGwM=", + "rev": "a52756acb1c5e133089c798736dd171567df11f5", + "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libsync/src": { + "args": { + "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=", + "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6", + "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libunwind/src": { + "args": { + "hash": "sha256-LdRaxPo2i7uMeFxpR7R4o3V+1ycBcygT/D+gklsD0tA=", + "rev": "e2e6f2a67e9420e770b014ce9bba476fa2ab9874", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libva-fake-driver/src": { + "args": { + "hash": "sha256-em/8rNqwv6szlxyji7mnYr3nObSW/x3OzEEnkiLuqpI=", + "rev": "a9bcab9cd6b15d4e3634ca44d5e5f7652c612194", + "url": "https://chromium.googlesource.com/chromiumos/platform/libva-fake-driver.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libvpx/source/libvpx": { + "args": { + "hash": "sha256-+4I6B1aTa+txhey6LMeflU0pe39V6TJ+lNIJPh6yFGM=", + "rev": "027bbee30a0103b99d86327b48d29567fed11688", + "url": "https://chromium.googlesource.com/webm/libvpx.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libwebm/source": { + "args": { + "hash": "sha256-t7An0vYzukel0poLaU4t2k78k3tTR5didbcV47cGWxQ=", + "rev": "e79a98159fdf6d1aa37b3500e32c6410a2cbe268", + "url": "https://chromium.googlesource.com/webm/libwebm.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libwebp/src": { + "args": { + "hash": "sha256-0sKGhXr6Rrpq0eoitAdLQ4l4fgNOzMWIEICrPyzwNz4=", + "rev": "2af6c034ac871c967e04c8c9f8bf2dbc2e271b18", + "url": "https://chromium.googlesource.com/webm/libwebp.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/libyuv": { + "args": { + "hash": "sha256-8sH11psWPXLMy3Q0tAizCZ/woUWvTCCUf44jcr2C4Xs=", + "rev": "ccdf870348764e4b77fa3b56accb2a896a901bad", + "url": "https://chromium.googlesource.com/libyuv/libyuv.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/llvm-libc/src": { + "args": { + "hash": "sha256-9Ieaxe0PFIIP4RttODd8pTw/zVjQZGZtaYSybwnzTz0=", + "rev": "97989c1bfa112c81f6499487fedc661dcf6d3b2e", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/lss": { + "args": { + "hash": "sha256-rhp4EcZYdgSfu9cqn+zxxGx6v2IW8uX8V+iA0UfZhFY=", + "rev": "ed31caa60f20a4f6569883b2d752ef7522de51e0", + "url": "https://chromium.googlesource.com/linux-syscall-support.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/material_color_utilities/src": { + "args": { + "hash": "sha256-Y85XU+z9W6tvmDNHJ/dXQnUKXvvDkO3nH/kUJRLqbc4=", + "rev": "13434b50dcb64a482cc91191f8cf6151d90f5465", + "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/minigbm/src": { + "args": { + "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", + "rev": "3018207f4d89395cc271278fb9a6558b660885f5", + "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/nan": { + "args": { + "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=", + "owner": "nodejs", + "repo": "nan", + "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213" + }, + "fetcher": "fetchFromGitHub" + }, + "src/third_party/nasm": { + "args": { + "hash": "sha256-yg4qwhS68B/sWfcJeXUqPC69ppE8FaIyRc+IkUQXSnU=", + "rev": "767a169c8811b090df222a458b25dfa137fc637e", + "url": "https://chromium.googlesource.com/chromium/deps/nasm.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/nearby/src": { + "args": { + "hash": "sha256-qIIyCHay3vkE14GVCq77psm1OyuEYs4guAaQDlEwiMg=", + "rev": "8acf9249344ea9ff9806d0d7f46e07640fddf550", + "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/neon_2_sse/src": { + "args": { + "hash": "sha256-AkDAHOPO5NdXXk0hETS5D67mzw0RVXwPDDKqM0XXo5g=", + "rev": "eb8b80b28f956275e291ea04a7beb5ed8289e872", + "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/openh264/src": { + "args": { + "hash": "sha256-tf0lnxATCkoq+xRti6gK6J47HwioAYWnpEsLGSA5Xdg=", + "rev": "652bdb7719f30b52b08e506645a7322ff1b2cc6f", + "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/openscreen/src": { + "args": { + "hash": "sha256-K/frmCf3JMvPVZc6ZKPFAQrq4Pz4io3XBvADS0O5u78=", + "rev": "db9e1ea566813606ca055868be13f6ff4a760ab8", + "url": "https://chromium.googlesource.com/openscreen" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/openscreen/src/buildtools": { + "args": { + "hash": "sha256-QXGJRGyyuN0EPDAF7CAzcTSbjHkz8FRjhqd1JEFF/1o=", + "rev": "00459762409cb29cecf398a23cdb0cae918b7515", + "url": "https://chromium.googlesource.com/chromium/src/buildtools" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/openscreen/src/third_party/tinycbor/src": { + "args": { + "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", + "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7", + "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/ots/src": { + "args": { + "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", + "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33", + "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/pdfium": { + "args": { + "hash": "sha256-6gsur+fx546YJn/PUOOthuj+XrSIruVUeAYl4nRI6xM=", + "rev": "ca83e69429af8f0bfa34b22dc54f538b9eebf5c5", + "url": "https://pdfium.googlesource.com/pdfium.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/perfetto": { + "args": { + "hash": "sha256-2jKRhHLitR0m2a4/asvVvTqAOhUlyLsBBSjpQAer4GA=", + "rev": "054635b91453895720951f7329619d003a98b3e4", + "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/protobuf-javascript/src": { + "args": { + "hash": "sha256-zq86SrDASl6aYPFPijRZp03hJqXUFz2Al/KkiNq7i0M=", + "rev": "eb785a9363664a402b6336dfe96aad27fb33ffa8", + "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/pthreadpool/src": { + "args": { + "hash": "sha256-mB1QaAuY8vfv8FasPyio1AF75iYH+dM8t1GIr0Ty/+g=", + "rev": "4e1831c02c74334a35ead03362f3342b6cea2a86", + "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/pyelftools": { + "args": { + "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=", + "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae", + "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/pywebsocket3/src": { + "args": { + "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", + "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/quic_trace/src": { + "args": { + "hash": "sha256-vbXqddDgwqetU0bDYn3qo7OBqT5eG926/MbA1hKkCT0=", + "rev": "ed3deb8a056b260c59f2fd42af6dfa3db48a8cad", + "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/re2/src": { + "args": { + "hash": "sha256-f/k2rloV2Nwb0KuJGUX4SijFxAx69EXcsXOG4vo+Kis=", + "rev": "c84a140c93352cdabbfb547c531be34515b12228", + "url": "https://chromium.googlesource.com/external/github.com/google/re2.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/ruy/src": { + "args": { + "hash": "sha256-O3JEtXchCdIHdGvjD6kGMJzj7TWVczQCW2YUHK3cABA=", + "rev": "83fd40d730feb0804fafbc2d8814bcc19a17b2e5", + "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/search_engines_data/resources": { + "args": { + "hash": "sha256-DTz351NpoygQLESm/z+fzFc/KGJyQelLnWpzNMmNT9o=", + "rev": "07834ba1e5ebfb333d0b73556b7c4d62a53cb455", + "url": "https://chromium.googlesource.com/external/search_engines_data.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/securemessage/src": { + "args": { + "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", + "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84", + "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/skia": { + "args": { + "hash": "sha256-LQDs+V7XFK+XcySrr53WZVX6DhyJypePBc/B8FDh5Gw=", + "rev": "8b7f0fd0f95b97d863da34ccfa52a0f931cbd13f", + "url": "https://skia.googlesource.com/skia.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/smhasher/src": { + "args": { + "hash": "sha256-OgZQwkQcVgRMf62ROGuY+3zQhBoWuUSP4naTmSKdq8s=", + "rev": "0ff96f7835817a27d0487325b6c16033e2992eb5", + "url": "https://chromium.googlesource.com/external/smhasher.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/snappy/src": { + "args": { + "hash": "sha256-jUwnjbaqXz7fgI2TPRK7SlUPQUVzcpjp4ZlFbEzwA+o=", + "rev": "32ded457c0b1fe78ceb8397632c416568d6714a0", + "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/speedometer/main": { + "args": { + "hash": "sha256-/nAK2uLjpPem37XCHHx3LGZEpvL/7w4Uw5bVpQ4C6ms=", + "rev": "c760d160caa05792d3ed7650e85861c9f9462506", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/speedometer/v2.0": { + "args": { + "hash": "sha256-p7WUS8gZUaS+LOm7pNmRkwgxjx+V8R6yy7bbaEHaIs4=", + "rev": "732af0dfe867f8815e662ac637357e55f285dbbb", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/speedometer/v2.1": { + "args": { + "hash": "sha256-0z5tZlz32fYh9I1ALqfLm2WWO8HiRBwt0hcmgKQhaeM=", + "rev": "8bf7946e39e47c875c00767177197aea5727e84a", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/speedometer/v3.0": { + "args": { + "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=", + "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/speedometer/v3.1": { + "args": { + "hash": "sha256-G89mrrgRaANT1vqzhKPQKemHbz56YwR+oku7rlRoCHw=", + "rev": "1386415be8fef2f6b6bbdbe1828872471c5d802a", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/spirv-cross/src": { + "args": { + "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=", + "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/spirv-headers/src": { + "args": { + "hash": "sha256-s0Pe7kg5syKhK8qEZH8b7UCDa87Xk32Lh95cQbpLdAc=", + "rev": "8c88e0c4c94a21de825efccba5f99a862b049825", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/spirv-tools/src": { + "args": { + "hash": "sha256-u4WDbWywua71yWB1cVIt1IDZRe4NnT5bUq3yHLKBgPo=", + "rev": "2e83ad7e6f2cc51f7eaff3ffeb10e34351b3c157", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/sqlite/src": { + "args": { + "hash": "sha256-ltl3OTk/wZPSj3yYthNlKd3mBxef6l5uW6UYTwebNek=", + "rev": "567495a62a62dc013888500526e82837d727fe01", + "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/squirrel.mac": { + "args": { + "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=", + "owner": "Squirrel", + "repo": "Squirrel.Mac", + "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38" + }, + "fetcher": "fetchFromGitHub" + }, + "src/third_party/squirrel.mac/vendor/Mantle": { + "args": { + "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", + "owner": "Mantle", + "repo": "Mantle", + "rev": "78d3966b3c331292ea29ec38661b25df0a245948" + }, + "fetcher": "fetchFromGitHub" + }, + "src/third_party/squirrel.mac/vendor/ReactiveObjC": { + "args": { + "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", + "owner": "ReactiveCocoa", + "repo": "ReactiveObjC", + "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" + }, + "fetcher": "fetchFromGitHub" + }, + "src/third_party/swiftshader": { + "args": { + "hash": "sha256-QTGU9Dgc6rgMeFZvhZyYeYj5W+ClJO8Yfa4+K7TmEec=", + "rev": "4982425ff1bdcb2ce52a360edde58a379119bfde", + "url": "https://swiftshader.googlesource.com/SwiftShader.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/text-fragments-polyfill/src": { + "args": { + "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=", + "rev": "c036420683f672d685e27415de0a5f5e85bdc23f", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/tflite/src": { + "args": { + "hash": "sha256-S5zkpQZdhRdnZRUrUfi5FCrF2XFe3y/adAWwfh1OQYE=", + "rev": "c8ed430d092acd485f00e7a9d7a888a0857d0430", + "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/ukey2/src": { + "args": { + "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", + "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47", + "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/vulkan-deps": { + "args": { + "hash": "sha256-CI0X6zbRV/snGcQZOUKQFn8Zo6D6Out6nN027HGZaa8=", + "rev": "1648e664337ca19a4f8679cbb9547a5b4b926995", + "url": "https://chromium.googlesource.com/vulkan-deps" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/vulkan-headers/src": { + "args": { + "hash": "sha256-VqKQeJd81feSgYnYLqb2sYirCmnHN9Rr19/4cPZ2TzE=", + "rev": "78c359741d855213e8685278eb81bb62599f8e56", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/vulkan-loader/src": { + "args": { + "hash": "sha256-tDW5ed6gsDKlCKf4gT8MNi1yaafocUTohL1upGKB+Cc=", + "rev": "723d6b4aa35853315c6e021ec86388b3a2559fae", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/vulkan-tools/src": { + "args": { + "hash": "sha256-Cw7LWBPRbDVlfmeMM4CYEC9xbfqT1wV7yuUcpGMLahs=", + "rev": "289efccc7560f2b970e2b4e0f50349da87669311", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/vulkan-utility-libraries/src": { + "args": { + "hash": "sha256-NdvjtdCrNVKY23B4YDL33KB+/9HsSWTVolZJOto8+pc=", + "rev": "0d5b49b80f17bca25e7f9321ad4e671a56f70887", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/vulkan-validation-layers/src": { + "args": { + "hash": "sha256-2GII+RBRzPZTTib82srUEFDG+CbtPTZ6lX3oDJBC2gU=", + "rev": "73d7d74bc979c8a16c823c4eae4ee881153e000a", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/vulkan_memory_allocator": { + "args": { + "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=", + "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21", + "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/wasm_tts_engine/src": { + "args": { + "hash": "sha256-t5eeehwspRLaowEMPLa8/lV5AHamXQBfH/un0DHLVAM=", + "rev": "53d2aba6f0cf7db57e17edfc3ff6471871b0c125", + "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/wayland-protocols/gtk": { + "args": { + "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", + "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0", + "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/wayland-protocols/kde": { + "args": { + "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", + "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e", + "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/wayland-protocols/src": { + "args": { + "hash": "sha256-o/adWEXYSqWib6KoK7XMCWbojapcS4O/CEPxv7iFCw8=", + "rev": "7d5a3a8b494ae44cd9651f9505e88a250082765e", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/wayland/src": { + "args": { + "hash": "sha256-oK0Z8xO2ILuySGZS0m37ZF0MOyle2l8AXb0/6wai0/w=", + "rev": "a156431ea66fe67d69c9fbba8a8ad34dabbab81c", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/webdriver/pylib": { + "args": { + "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=", + "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04", + "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/webgl/src": { + "args": { + "hash": "sha256-mSketnpcDtz3NnhPkXMpMpq8MWcFiSviJbK6h06fcnw=", + "rev": "c01b768bce4a143e152c1870b6ba99ea6267d2b0", + "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/webgpu-cts/src": { + "args": { + "hash": "sha256-vXyp0+6eyKOzzQbkRa8f8dO+B9cyUCY2hCZEFc7+7lU=", + "rev": "92f4eb4dae0f5439f2cdc7ce467d66b10e165f42", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/webpagereplay": { + "args": { + "hash": "sha256-lMqCZ27TJ4aXKWDuN22VtceXh0jNH4Ll1234xCbEOro=", + "rev": "2c5049abfc2cf36ece82f7f84ebdcb786659eaf7", + "url": "https://chromium.googlesource.com/webpagereplay.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/webrtc": { + "args": { + "hash": "sha256-cNONf88oSbsdYuSdPiLxgTI973qOP6fb1OKb2WMQMMg=", + "rev": "2c8f5be6924d507ee74191b1aeadcec07f747f21", + "url": "https://webrtc.googlesource.com/src.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/weston/src": { + "args": { + "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=", + "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/wuffs/src": { + "args": { + "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=", + "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8", + "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/xdg-utils": { + "args": { + "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=", + "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44", + "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/xnnpack/src": { + "args": { + "hash": "sha256-p5DjGNH9IR0KPWSFmbsdt2PU+kHgWRAnBw7J9sLV/S8=", + "rev": "d6fc3be20b0d3e3742157fa26c5359babaa8bc8b", + "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/third_party/zstd/src": { + "args": { + "hash": "sha256-hDDNrUXGxG/o1oZnypAnuLyIeM16Hy6x1KacGu9Hhmw=", + "rev": "ef2bf5781112a4cd6b62ac1817f7842bbdc7ea8f", + "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git" + }, + "fetcher": "fetchFromGitiles" + }, + "src/v8": { + "args": { + "hash": "sha256-Gc7huCu+d5XBwI420V1nutKeJpqBfvJ6fhh5zpRtMw4=", + "rev": "b6178615ecae6d84b347cb7a1812cad9afca51f2", + "url": "https://chromium.googlesource.com/v8/v8.git" + }, + "fetcher": "fetchFromGitiles" + } + }, + "electron_yarn_hash": "195amc05nj4p1x0mqi04m3qgw15k7fj62lw0xbrjz5iyjdyrdxan", + "modules": "135", + "node": "22.14.0", + "version": "36.1.0" } } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 230911d17901..75f2e95b0917 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7819,7 +7819,11 @@ with pkgs; electron-source.electron_35 else electron_35-bin; - electron_36 = electron_36-bin; + electron_36 = + if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_36 then + electron-source.electron_36 + else + electron_36-bin; electron = electron_35; electron-bin = electron_35-bin; electron-chromedriver = electron-chromedriver_35; From 6d7712d625239b77687e8b9a4fa03c720b132d6b Mon Sep 17 00:00:00 2001 From: Yureka Date: Sun, 4 May 2025 18:20:14 +0200 Subject: [PATCH 88/93] bird3: downgrade to 3.0.2 (#404140) --- pkgs/by-name/bi/bird3/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bi/bird3/package.nix b/pkgs/by-name/bi/bird3/package.nix index 40459a43611f..4c581fb75bed 100644 --- a/pkgs/by-name/bi/bird3/package.nix +++ b/pkgs/by-name/bi/bird3/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "bird"; - version = "3.1.0"; + version = "3.0.2"; src = fetchurl { url = "https://bird.network.cz/download/bird-${version}.tar.gz"; - hash = "sha256-xxY49Xb0MWcEN++dkL6lZZK8VjcB3nhpg/RCJk7Hdiw="; + hash = "sha256-eKqL5820LfFLnilpu2Q7IoxoBMZXj5CTsXPOiiQ3zDA="; }; nativeBuildInputs = [ From e67623596d0f31f912652729993ec20f8bd91059 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 4 May 2025 16:22:24 +0200 Subject: [PATCH 89/93] workflows/labeler: fix repo owner condition Introduced in #402332, but broken on all ends: - pull_request needs to be event.pull_request - pull_request.head is an object, not a string - github.ref_protected is about the target branch, because this runs as a pull_request_target event Thus, we need to list the branches manually. --- ...s.yml => labeler-development-branches.yml} | 2 +- .github/workflows/labels.yml | 26 ++++++++++++++++--- 2 files changed, 23 insertions(+), 5 deletions(-) rename .github/{labeler-protected-branches.yml => labeler-development-branches.yml} (75%) diff --git a/.github/labeler-protected-branches.yml b/.github/labeler-development-branches.yml similarity index 75% rename from .github/labeler-protected-branches.yml rename to .github/labeler-development-branches.yml index b8c0af693338..e0b855a07cde 100644 --- a/.github/labeler-protected-branches.yml +++ b/.github/labeler-development-branches.yml @@ -1,5 +1,5 @@ # This file is used by .github/workflows/labels.yml -# This version is only run for Pull Requests from protected branches like staging-next, haskell-updates or python-updates. +# This version is only run for Pull Requests from development branches like staging-next, haskell-updates or python-updates. "4.workflow: package set update": - any: diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index 4aefb306c048..2c003bf1dec4 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -20,22 +20,40 @@ jobs: if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')" steps: - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0 - if: "!(github.pull_request.head.repo == 'NixOS' && github.ref_protected)" + if: | + github.event.pull_request.head.repo.owner.login != 'NixOS' || !( + github.head_ref == "haskell-updates" || + github.head_ref == "python-updates" || + github.head_ref == "staging-next" || + startsWith(github.head_ref, "staging-next-") + ) with: repo-token: ${{ secrets.GITHUB_TOKEN }} configuration-path: .github/labeler.yml # default sync-labels: true - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0 - if: "!(github.pull_request.head.repo == 'NixOS' && github.ref_protected)" + if: | + github.event.pull_request.head.repo.owner.login != 'NixOS' || !( + github.head_ref == "haskell-updates" || + github.head_ref == "python-updates" || + github.head_ref == "staging-next" || + startsWith(github.head_ref, "staging-next-") + ) with: repo-token: ${{ secrets.GITHUB_TOKEN }} configuration-path: .github/labeler-no-sync.yml sync-labels: false - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0 - # Protected branches like staging-next, haskell-updates and python-updates get special labels. + # Development branches like staging-next, haskell-updates and python-updates get special labels. # This is to avoid the mass of labels there, which is mostly useless - and really annoying for # the backport labels. - if: "github.pull_request.head.repo == 'NixOS' && github.ref_protected" + if: | + github.event.pull_request.head.repo.owner.login == 'NixOS' && ( + github.head_ref == "haskell-updates" || + github.head_ref == "python-updates" || + github.head_ref == "staging-next" || + startsWith(github.head_ref, "staging-next-") + ) with: repo-token: ${{ secrets.GITHUB_TOKEN }} configuration-path: .github/labeler-protected-branches.yml From 374e14f2eabdbd31f1d51ce4be255d1e10b1f24f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 May 2025 17:01:01 +0000 Subject: [PATCH 90/93] phpExtensions.ds: 1.5.0 -> 1.6.0 --- pkgs/development/php-packages/ds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/ds/default.nix b/pkgs/development/php-packages/ds/default.nix index 617f0be772ab..bc4224a84025 100644 --- a/pkgs/development/php-packages/ds/default.nix +++ b/pkgs/development/php-packages/ds/default.nix @@ -7,7 +7,7 @@ }: let - version = "1.5.0"; + version = "1.6.0"; in buildPecl { inherit version; @@ -17,7 +17,7 @@ buildPecl { owner = "php-ds"; repo = "ext-ds"; rev = "v${version}"; - sha256 = "sha256-lL1PUjc4bMTsWm2th0wDxnMaGuVziBUtgK88bUJXuBY="; + sha256 = "sha256-c7MIqaPwIgdzKHRqR2km1uTQRrrr3OzDzopTbz5rLnE="; }; buildInputs = [ pcre2 ]; From b6375b21c0996de13051110c80ff72ec1669261c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 4 May 2025 19:11:36 +0200 Subject: [PATCH 91/93] workflows/backport: fix conditional --- .github/workflows/backport.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index fe86eb75cac4..2d09c59819a7 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -14,7 +14,7 @@ permissions: {} jobs: backport: name: Backport Pull Request - if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.pull_request.action != 'labeled' || startsWith(github.event.label.name, 'backport')) + if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event.action != 'labeled' || startsWith(github.event.label.name, 'backport')) runs-on: ubuntu-24.04 steps: # Use a GitHub App to create the PR so that CI gets triggered From 2480e356dc9309a48389aacb80f4bdd8fd2a0897 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 4 May 2025 19:18:41 +0200 Subject: [PATCH 92/93] workflows/backport: avoid broken korthout/backport-action output Somehow, the was_successful output didn't work correctly. It's hard to imagine that the created_pull_numbers output fails the same way, because... when the backport action fails there **are no pull request numbers**. --- .github/workflows/backport.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index fe86eb75cac4..a0dff5db81cb 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -46,7 +46,7 @@ jobs: * Even as a non-commiter, if you find that it is not acceptable, leave a comment. - name: "Add 'has: port to stable' label" - if: steps.backport.outputs.was_successful + if: steps.backport.outputs.created_pull_numbers != '' env: GH_TOKEN: ${{ steps.app-token.outputs.token }} REPOSITORY: ${{ github.repository }} From 6cb93f221b91b747962cae9d1de26d99f4e1003c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 4 May 2025 19:25:26 +0200 Subject: [PATCH 93/93] workflows/labeler: fix double quotes Because GitHub Actions doesn't like double quotes. --- .github/workflows/labels.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index 2c003bf1dec4..284905d62e0b 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -22,10 +22,10 @@ jobs: - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0 if: | github.event.pull_request.head.repo.owner.login != 'NixOS' || !( - github.head_ref == "haskell-updates" || - github.head_ref == "python-updates" || - github.head_ref == "staging-next" || - startsWith(github.head_ref, "staging-next-") + github.head_ref == 'haskell-updates' || + github.head_ref == 'python-updates' || + github.head_ref == 'staging-next' || + startsWith(github.head_ref, 'staging-next-') ) with: repo-token: ${{ secrets.GITHUB_TOKEN }} @@ -34,10 +34,10 @@ jobs: - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0 if: | github.event.pull_request.head.repo.owner.login != 'NixOS' || !( - github.head_ref == "haskell-updates" || - github.head_ref == "python-updates" || - github.head_ref == "staging-next" || - startsWith(github.head_ref, "staging-next-") + github.head_ref == 'haskell-updates' || + github.head_ref == 'python-updates' || + github.head_ref == 'staging-next' || + startsWith(github.head_ref, 'staging-next-') ) with: repo-token: ${{ secrets.GITHUB_TOKEN }} @@ -49,10 +49,10 @@ jobs: # the backport labels. if: | github.event.pull_request.head.repo.owner.login == 'NixOS' && ( - github.head_ref == "haskell-updates" || - github.head_ref == "python-updates" || - github.head_ref == "staging-next" || - startsWith(github.head_ref, "staging-next-") + github.head_ref == 'haskell-updates' || + github.head_ref == 'python-updates' || + github.head_ref == 'staging-next' || + startsWith(github.head_ref, 'staging-next-') ) with: repo-token: ${{ secrets.GITHUB_TOKEN }}