From 889670444ba8e209214652636ca55defe5eb551e Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sat, 20 Jul 2024 16:01:50 +0200 Subject: [PATCH 01/93] ubootOrangePi5Plus: init --- pkgs/misc/uboot/default.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 9 insertions(+) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 8c2fcb2eba53..8fd54b62f427 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -389,6 +389,14 @@ in { filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ]; }; + ubootOrangePi5Plus = buildUBoot { + defconfig = "orangepi-5-plus-rk3588_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + BL31 = "${armTrustedFirmwareRK3588}/bl31.elf"; + ROCKCHIP_TPL = rkbin.TPL_RK3588; + filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ]; + }; + ubootOrangePiPc = buildUBoot { defconfig = "orangepi_pc_defconfig"; extraMeta.platforms = ["armv7l-linux"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f312ca683ded..4c9cdf47fb43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27698,6 +27698,7 @@ with pkgs; ubootOlimexA64Teres1 ubootOrangePi3 ubootOrangePi5 + ubootOrangePi5Plus ubootOrangePiPc ubootOrangePiZeroPlus2H5 ubootOrangePiZero From b87850d1d5dab3a0cd7c5e69073570ab4507778a Mon Sep 17 00:00:00 2001 From: nikstur Date: Fri, 2 Aug 2024 15:02:59 +0200 Subject: [PATCH 02/93] nixos/etc: remove assertion --- nixos/modules/system/etc/etc-activation.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/nixos/modules/system/etc/etc-activation.nix b/nixos/modules/system/etc/etc-activation.nix index f47fd771c659..8108bdf6c9fa 100644 --- a/nixos/modules/system/etc/etc-activation.nix +++ b/nixos/modules/system/etc/etc-activation.nix @@ -26,13 +26,6 @@ assertion = lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.6"; message = "`system.etc.overlay.enable requires a newer kernel, at least version 6.6"; } - { - assertion = config.systemd.sysusers.enable -> (config.users.mutableUsers == config.system.etc.overlay.mutable); - message = '' - When using systemd-sysusers and mounting `/etc` via an overlay, users - can only be mutable when `/etc` is mutable and vice versa. - ''; - } ]; boot.initrd.availableKernelModules = [ "loop" "erofs" "overlay" ]; From 447c12c4f0d22f889961e232ab25c6523f161e51 Mon Sep 17 00:00:00 2001 From: nikstur Date: Fri, 2 Aug 2024 15:46:14 +0200 Subject: [PATCH 03/93] nixos/system-sysusers: include username in assertion --- nixos/modules/system/boot/systemd/sysusers.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/systemd/sysusers.nix b/nixos/modules/system/boot/systemd/sysusers.nix index 8d401436daa1..9dfbcb65326e 100644 --- a/nixos/modules/system/boot/systemd/sysusers.nix +++ b/nixos/modules/system/boot/systemd/sysusers.nix @@ -73,9 +73,9 @@ in message = "config.users.mutableUsers requires config.system.etc.overlay.enable."; } ] ++ (lib.mapAttrsToList - (_username: opts: { + (username: opts: { assertion = !opts.isNormalUser; - message = "systemd-sysusers doesn't create normal users. You can currently only use it to create system users."; + message = "${username} is a normal user. systemd-sysusers doesn't create normal users, only system users."; }) userCfg.users) ++ lib.mapAttrsToList From 57e7129b3a156858a37c94b2af3fda2634d9aaac Mon Sep 17 00:00:00 2001 From: nikstur Date: Mon, 5 Aug 2024 16:24:47 +0200 Subject: [PATCH 04/93] nixos/systemd-sysusers: remove assertion --- nixos/modules/system/boot/systemd/sysusers.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nixos/modules/system/boot/systemd/sysusers.nix b/nixos/modules/system/boot/systemd/sysusers.nix index 9dfbcb65326e..e3dfe52e741b 100644 --- a/nixos/modules/system/boot/systemd/sysusers.nix +++ b/nixos/modules/system/boot/systemd/sysusers.nix @@ -68,10 +68,6 @@ in assertion = config.system.activationScripts.users == ""; message = "system.activationScripts.users has to be empty to use systemd-sysusers"; } - { - assertion = config.users.mutableUsers -> config.system.etc.overlay.enable; - message = "config.users.mutableUsers requires config.system.etc.overlay.enable."; - } ] ++ (lib.mapAttrsToList (username: opts: { assertion = !opts.isNormalUser; From b84ff32c5c911ec34ccb36049499243ae924122a Mon Sep 17 00:00:00 2001 From: Helge Gehring Date: Wed, 7 Aug 2024 00:38:54 +0000 Subject: [PATCH 05/93] klayout: 0.28.12 -> 0.29.5 --- pkgs/applications/misc/klayout/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 0b1bc647917a..c31d4354911a 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -1,17 +1,17 @@ { lib, mkDerivation, fetchFromGitHub , python3, ruby, qtbase, qtmultimedia, qttools, qtxmlpatterns -, which, perl +, which, perl, libgit2 }: mkDerivation rec { pname = "klayout"; - version = "0.28.12"; + version = "0.29.5"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - hash = "sha256-QvEoXKJ9sH5WIarYPsYEWwoFwA/pZa2etegA+AD8rPo="; + hash = "sha256-V6LrVZJdARUZ+aYGe1fWulbOpr2Qs5oqnclFvmc1vhw="; }; postPatch = '' @@ -31,6 +31,7 @@ mkDerivation rec { qtmultimedia qttools qtxmlpatterns + libgit2 ]; buildPhase = '' From 864bf237e759da917245edb26dbb77d23b00cbb6 Mon Sep 17 00:00:00 2001 From: Vedant <83997633+vedantmgoyal9@users.noreply.github.com> Date: Tue, 3 Sep 2024 03:43:43 +0530 Subject: [PATCH 06/93] aliae: init at 0.22.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Nikolay Korotkiy Co-authored-by: éclairevoyant <848000+eclairevoyant@users.noreply.github.com> --- pkgs/by-name/al/aliae/package.nix | 57 +++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 pkgs/by-name/al/aliae/package.nix diff --git a/pkgs/by-name/al/aliae/package.nix b/pkgs/by-name/al/aliae/package.nix new file mode 100644 index 000000000000..49e4c665ad52 --- /dev/null +++ b/pkgs/by-name/al/aliae/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, +}: + +buildGoModule rec { + pname = "aliae"; + version = "0.22.1"; + + src = fetchFromGitHub { + owner = "jandedobbeleer"; + repo = "aliae"; + rev = "refs/tags/v${version}"; + hash = "sha256-slixB7mzEdX3ecgbM6tO9IzVH+1w6DwssD1X3MrwAHw="; + }; + + vendorHash = "sha256-U0Mt2U8WxDFDadIxASz609tUtiF4tETobAmYrk29Lh0="; + + sourceRoot = "${src.name}/src"; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + ]; + + tags = [ + "netgo" + "osusergo" + "static_build" + ]; + + postInstall = + '' + mv $out/bin/{src,aliae} + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd aliae \ + --bash <($out/bin/aliae completion bash) \ + --fish <($out/bin/aliae completion fish) \ + --zsh <($out/bin/aliae completion zsh) + ''; + + meta = { + description = "Cross shell and platform alias management"; + mainProgram = "aliae"; + homepage = "https://aliae.dev"; + changelog = "https://github.com/JanDeDobbeleer/aliae/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ vedantmgoyal9 ]; + }; +} From c790be2e0ee49b4960b46030c386fe974742098a Mon Sep 17 00:00:00 2001 From: L-Trump Date: Fri, 6 Sep 2024 03:49:20 +0800 Subject: [PATCH 07/93] maintainers: add ltrump --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bfe5e59b86dd..286e17d5f2d1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12087,6 +12087,12 @@ githubId = 8555953; name = "Laure Tavard"; }; + ltrump = { + email = "ltrump@163.com"; + github = "L-Trump"; + githubId = 37738631; + name = "Luo Chen"; + }; ltstf1re = { email = "ltstf1re@disroot.org"; github = "lsf1re"; From 01d0b0b6834022a5d61a09c0013715c7aeb6be9f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 2 Sep 2024 18:30:59 +0200 Subject: [PATCH 08/93] nixos/logrotate: harden systemd unit Logrotate is a service that runs as root and moves logfiles around while keeping ownership of these files intact. This means we can and should severely limit the scope of what can be done during its runtime. --- nixos/modules/services/logging/logrotate.nix | 51 ++++++++++++++++++-- nixos/tests/logrotate.nix | 2 + 2 files changed, 50 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix index 6db1b108cc6c..6fb5f0588d97 100644 --- a/nixos/modules/services/logging/logrotate.nix +++ b/nixos/modules/services/logging/logrotate.nix @@ -97,6 +97,8 @@ in defaultText = lib.literalExpression "cfg.settings != {}"; }; + allowNetworking = lib.mkEnableOption "network access for logrotate"; + settings = lib.mkOption { default = { }; description = '' @@ -240,12 +242,55 @@ in config = lib.mkIf cfg.enable { systemd.services.logrotate = { description = "Logrotate Service"; + documentation = [ + "man:logrotate(8)" + "man:logrotate(5)" + ]; startAt = "hourly"; serviceConfig = { - Restart = "no"; - User = "root"; - ExecStart = "${pkgs.logrotate}/sbin/logrotate ${utils.escapeSystemdExecArgs cfg.extraArgs} ${mailOption} ${cfg.configFile}"; + Type = "oneshot"; + ExecStart = "${lib.getExe pkgs.logrotate} ${utils.escapeSystemdExecArgs cfg.extraArgs} ${mailOption} ${cfg.configFile}"; + + # performance + Nice = 19; + IOSchedulingClass = "best-effort"; + IOSchedulingPriority = 7; + + # hardening + CapabilityBoundingSet = [ + "CAP_CHOWN" + "CAP_SETGID" + ]; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "full"; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged @resources" + "@chown" + ]; + UMask = "0027"; + } // lib.optionalAttrs (!cfg.allowNetworking) { + PrivateNetwork = true; + RestrictAddressFamilies = "none"; }; }; systemd.services.logrotate-checkconf = { diff --git a/nixos/tests/logrotate.nix b/nixos/tests/logrotate.nix index f9c5e9060970..8d5887abec94 100644 --- a/nixos/tests/logrotate.nix +++ b/nixos/tests/logrotate.nix @@ -127,5 +127,7 @@ import ./make-test-python.nix ({ pkgs, ... }: rec { if info["ActiveState"] != "failed": raise Exception('logrotate-checkconf.service was not failed') + machine.log(machine.execute("systemd-analyze security logrotate.service | grep -v ✓")[1]) + ''; }) From 5ccb0b428cf773155ce205cc97b9974ada17673b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Sep 2024 02:32:49 +0200 Subject: [PATCH 09/93] nixos/doc/rl-2411: add logrotate breaking change --- nixos/doc/manual/release-notes/rl-2411.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 22377ce3fbc8..13571e51438a 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -168,6 +168,8 @@ - The `MSMTP_QUEUE` and `MSMTP_LOG` environment variables accepted by `msmtpq` have now been renamed to `MSMTPQ_Q` and `MSMTPQ_LOG` respectively. +- The logrotate service has received hardening and now requires enabling `allowNetworking`, if logrotate needs to access the network. + - The fcgiwrap module now allows multiple instances running as distinct users. The option `services.fgciwrap` now takes an attribute set of the configuration of each individual instance. From 492e603ecd14f51a61b9683181418e981267e5cc Mon Sep 17 00:00:00 2001 From: Philip Hayes Date: Tue, 10 Sep 2024 19:40:22 -0700 Subject: [PATCH 10/93] flutter: fix iOS build error Without this patch, `xcode_backend.sh` gets confused by the flutter SDK `symlinkJoin` and picks up the `dart` executable from `flutter-unwrapped`, which manifests in the following error during an iOS/macOS build: ``` Error (Xcode): Target debug_unpack_ios failed: Error: Flutter failed to create a directory at "/-flutter-3.24.1-unwrapped/bin/cache/artifacts". ``` --- .../fix-ios-build-xcode-backend-sh.patch | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 pkgs/development/compilers/flutter/versions/3_24/patches/fix-ios-build-xcode-backend-sh.patch diff --git a/pkgs/development/compilers/flutter/versions/3_24/patches/fix-ios-build-xcode-backend-sh.patch b/pkgs/development/compilers/flutter/versions/3_24/patches/fix-ios-build-xcode-backend-sh.patch new file mode 100644 index 000000000000..825d40fc6176 --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_24/patches/fix-ios-build-xcode-backend-sh.patch @@ -0,0 +1,69 @@ +From 6df275df3b8694daf16302b407520e3b1dee6724 Mon Sep 17 00:00:00 2001 +From: Philip Hayes +Date: Thu, 12 Sep 2024 13:23:00 -0700 +Subject: [PATCH] fix: cleanup xcode_backend.sh to fix iOS build w/ + `NixOS/nixpkgs` flutter + +This patch cleans up `xcode_backend.sh`. It now effectively just runs +`exec $FLUTTER_ROOT/bin/dart ./xcode_backend.dart`. + +The previous `xcode_backend.sh` tries to discover `$FLUTTER_ROOT` from +argv[0], even though its presence is already guaranteed (the wrapped +`xcode_backend.dart` also relies on this env). + +When using nixpkgs flutter, the flutter SDK directory is composed of several +layers, joined together using symlinks (called a `symlinkJoin`). Without this +patch, the auto-discover traverses the symlinks into the wrong layer, and so it +uses an "unwrapped" `dart` command instead of a "wrapped" dart that sets some +important envs/flags (like `$FLUTTER_ROOT`). + +Using the "unwrapped" dart then manifests in this error when compiling, since +it doesn't see the ios build-support artifacts: + +``` +$ flutter run -d iphone +Running Xcode build... +Xcode build done. 6.4s +Failed to build iOS app +Error (Xcode): Target debug_unpack_ios failed: Error: Flutter failed to create a directory at "//XXXX-flutter-3.24.1-unwrapped/bin/cache/artifacts". +``` +--- + packages/flutter_tools/bin/xcode_backend.sh | 25 ++++----------------- + 1 file changed, 4 insertions(+), 21 deletions(-) + +diff --git a/packages/flutter_tools/bin/xcode_backend.sh b/packages/flutter_tools/bin/xcode_backend.sh +index 2889d7c8e4..48b9d06c6e 100755 +--- a/packages/flutter_tools/bin/xcode_backend.sh ++++ b/packages/flutter_tools/bin/xcode_backend.sh +@@ -6,24 +6,7 @@ + # exit on error, or usage of unset var + set -euo pipefail + +-# Needed because if it is set, cd may print the path it changed to. +-unset CDPATH +- +-function follow_links() ( +- cd -P "$(dirname -- "$1")" +- file="$PWD/$(basename -- "$1")" +- while [[ -h "$file" ]]; do +- cd -P "$(dirname -- "$file")" +- file="$(readlink -- "$file")" +- cd -P "$(dirname -- "$file")" +- file="$PWD/$(basename -- "$file")" +- done +- echo "$file" +-) +- +-PROG_NAME="$(follow_links "${BASH_SOURCE[0]}")" +-BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)" +-FLUTTER_ROOT="$BIN_DIR/../../.." +-DART="$FLUTTER_ROOT/bin/dart" +- +-"$DART" "$BIN_DIR/xcode_backend.dart" "$@" ++# Run `dart ./xcode_backend.dart` with the dart from $FLUTTER_ROOT. ++dart="${FLUTTER_ROOT}/bin/dart" ++xcode_backend_dart="${BASH_SOURCE[0]%.sh}.dart" ++exec "${dart}" "${xcode_backend_dart}" "$@" +-- +2.46.0 + From 8ab57cea8a2ce8b8f0ba12932980cba8b5be21a0 Mon Sep 17 00:00:00 2001 From: Philip Hayes Date: Thu, 12 Sep 2024 16:02:37 -0700 Subject: [PATCH 11/93] flutter: prevent built iOS/macOS apps from containing links to nix store --- .../development/compilers/flutter/default.nix | 4 ++-- .../compilers/flutter/sdk-symlink.nix | 22 +++++++++++++++++++ .../development/compilers/flutter/wrapper.nix | 4 +--- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index c3ef3ab9db4a..6cb28e33d6b8 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -1,4 +1,4 @@ -{ useNixpkgsEngine ? false, callPackage, fetchzip, fetchFromGitHub, dart, lib, stdenv }@args: +{ useNixpkgsEngine ? false, callPackage, fetchzip, fetchFromGitHub, dart, lib, stdenv }: let mkCustomFlutter = args: callPackage ./flutter.nix args; wrapFlutter = flutter: callPackage ./wrapper.nix { inherit flutter; }; @@ -19,7 +19,7 @@ let , pubspecLock , artifactHashes , channel - }@fargs: + }: let args = { inherit version engineVersion engineSwiftShaderRev engineSwiftShaderHash engineHashes enginePatches patches pubspecLock artifactHashes useNixpkgsEngine channel; diff --git a/pkgs/development/compilers/flutter/sdk-symlink.nix b/pkgs/development/compilers/flutter/sdk-symlink.nix index 044a508805f5..98051efa5613 100644 --- a/pkgs/development/compilers/flutter/sdk-symlink.nix +++ b/pkgs/development/compilers/flutter/sdk-symlink.nix @@ -17,6 +17,28 @@ let if [ -d '${flutter.sdk}/.git' ]; then ln -s '${flutter.sdk}/.git' "$out" fi + + # For iOS/macOS builds, *.xcframework/'s from the pre-built + # artifacts are copied into each built app. However, the symlinkJoin + # means that the *.xcframework's contain symlinks into the nix store, + # which causes issues when actually running the apps. + # + # We'll fix this by only linking to an outer *.xcframework dir instead + # of trying to symlinkJoin the files inside the *.xcframework. + artifactsDir="$out/bin/cache/artifacts/engine" + shopt -s globstar + for file in "$artifactsDir"/**/*.xcframework/Info.plist; do + # Get the unwrapped path from the Info.plist inside each .xcframework + origFile="$(readlink -f "$file")" + origFrameworkDir="$(dirname "$origFile")" + + # Remove the symlinkJoin .xcframework dir and replace it with a symlink + # to the unwrapped .xcframework dir. + frameworkDir="$(dirname "$file")" + rm -r "$frameworkDir" + ln -s "$origFrameworkDir" "$frameworkDir" + done + shopt -u globstar ''; passthru = flutter.passthru // { diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index c988eba2e5ae..2c1b1ea125c8 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -18,7 +18,6 @@ , extraCFlags ? [ ] , extraLinkerFlags ? [ ] , makeWrapper -, runCommandLocal , writeShellScript , wrapGAppsHook3 , git @@ -39,7 +38,6 @@ , cmake , ninja , clang -, lndir , symlinkJoin }: @@ -56,7 +54,7 @@ let }; })); - cacheDir = symlinkJoin rec { + cacheDir = symlinkJoin { name = "flutter-cache-dir"; paths = builtins.attrValues flutterPlatformArtifacts; postBuild = '' From 3771c772f493dc10f297c4bf8129577e967c63ad Mon Sep 17 00:00:00 2001 From: Helge Gehring Date: Sat, 14 Sep 2024 06:52:39 +0000 Subject: [PATCH 12/93] klayout: 0.29.5 -> 0.29.6 --- pkgs/applications/misc/klayout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index c31d4354911a..afff0cd68368 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.29.5"; + version = "0.29.6"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - hash = "sha256-V6LrVZJdARUZ+aYGe1fWulbOpr2Qs5oqnclFvmc1vhw="; + hash = "sha256-gbbes8CPh+Z9wCeQaAaObZjQvBTMe06z8oR12i6e12M="; }; postPatch = '' From 90effb99edf82b41a082c3cf6e8726585f4b59c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 19 Sep 2024 11:43:21 -0700 Subject: [PATCH 13/93] electron_32-bin: init at 32.1.1 --- pkgs/development/tools/electron/binary/info.json | 11 +++++++++++ pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 89308480266e..8aa43f8213e5 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -64,5 +64,16 @@ "x86_64-linux": "9b95e66cb4d55bb632e37bcb6083992a5d665f0b378466a771a2948c1aab57b7" }, "version": "31.4.0" + }, + "32": { + "hashes": { + "aarch64-darwin": "b0e04b765702c35341e587e41b01eb9bcb1233953ab243a0c82e9555c04b269b", + "aarch64-linux": "1bf3b53cba77e070fb0da4b32540fedc29586b2111700b897fd62e3577708d53", + "armv7l-linux": "6e52f9fd163e54cb482354645dc32d42b24c6624bbb8927d194dbbb9eaf92959", + "headers": "0gw7yvj9i3kwmxbjj6w4l442saac3pcn3g7m42kvbpbwbfds1h4d", + "x86_64-darwin": "e3bb68b37e723af4aab8d9694661e5e9ecbe7b1fbc253fe263940dafffd66864", + "x86_64-linux": "5a9980bc3c80d1d2af0965eba2bc3c0f532b4ccc29194a595cefdd4dbe98e7dc" + }, + "version": "32.1.1" } } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1254d45dda59..228f5c3bfba2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17145,7 +17145,9 @@ with pkgs; electron_28-bin electron_29-bin electron_30-bin - electron_31-bin; + electron_31-bin + electron_32-bin + ; inherit (callPackages ../development/tools/electron/chromedriver { }) electron-chromedriver_29 @@ -17159,6 +17161,7 @@ with pkgs; electron_29 = electron_29-bin; electron_30 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_30 then electron-source.electron_30 else electron_30-bin; electron_31 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_31 then electron-source.electron_31 else electron_31-bin; + electron_32 = electron_32-bin; electron = electron_31; electron-bin = electron_31-bin; electron-chromedriver = electron-chromedriver_31; From 483e68aa6c6ad60b8ee283dac8eb3252ed2325a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 19 Sep 2024 11:23:21 -0700 Subject: [PATCH 14/93] bitwarden-desktop: 2024.8.2 -> 2024.9.0 Diff: https://github.com/bitwarden/clients/compare/desktop-v2024.8.2...desktop-v2024.9.0 Changelog: https://github.com/bitwarden/clients/releases/tag/desktop-v2024.9.0 --- pkgs/by-name/bi/bitwarden-desktop/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 104abfb85505..a45712bfe801 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -3,7 +3,7 @@ , cargo , copyDesktopItems , dbus -, electron_31 +, electron_32 , fetchFromGitHub , glib , gnome-keyring @@ -26,16 +26,16 @@ let description = "Secure and free password manager for all of your devices"; icon = "bitwarden"; - electron = electron_31; + electron = electron_32; in buildNpmPackage rec { pname = "bitwarden-desktop"; - version = "2024.8.2"; + version = "2024.9.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-KATT4W2pP7VTcoHeshGx5VrBwlg3UqzKPcRY0Rzo7II="; + hash = "sha256-o5nRG2j73qheDOyeFfSga64D8HbTn1EUrCiN0W+Xn0w="; }; patches = [ @@ -52,7 +52,7 @@ in buildNpmPackage rec { makeCacheWritable = true; npmFlags = [ "--engine-strict" "--legacy-peer-deps" ]; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-SnrK26QaxHYKX0532rGBASjx9PwxKSsVFRzZ3Cs2GPk="; + npmDepsHash = "sha256-L7/frKCNlq0xr6T+aSqyEQ44yrIXwcpdU/djrhCJNNk="; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; @@ -68,7 +68,7 @@ in buildNpmPackage rec { patches; patchFlags = [ "-p4" ]; sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-MjGKQky6LGtpG1maBWd+WkMZlnZfdl9Sm2dlvdD8ANw="; + hash = "sha256-y+6vaESiOeVrFJpZoOJ75onOpldqSsT2kqkMMzTDUmM="; }; cargoRoot = "apps/desktop/desktop_native"; From 9e4edca155dbc29551f46bb6ebccc3948999753d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 19 Sep 2024 11:48:00 -0700 Subject: [PATCH 15/93] electron-source.electron_32: init at 32.1.1 --- pkgs/development/tools/electron/info.json | 941 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 942 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 1bef706fa16f..d7af407e417b 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -1856,5 +1856,946 @@ "modules": "125", "node": "20.16.0", "version": "31.4.0" + }, + "32": { + "chrome": "128.0.6613.137", + "chromium": { + "deps": { + "gn": { + "hash": "sha256-BiMGbML5aNUt4JzzVqSszBj+8BMlEc92csNugo5qjUk=", + "rev": "b2afae122eeb6ce09c52d63f67dc53fc517dbdc8", + "url": "https://gn.googlesource.com/gn", + "version": "2024-06-11" + } + }, + "version": "128.0.6613.137" + }, + "chromium_npm_hash": "sha256-OBUYgjfoEZly8JLTtprfU+hlKNFSnHLheaVWhrirGJk=", + "deps": { + "src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-H+C79mGXUaDYcDoJz25iobN3xWUJz6OplleJlTX3ilg=", + "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", + "rev": "128.0.6613.137", + "url": "https://chromium.googlesource.com/chromium/src.git" + }, + "src/chrome/test/data/perf/canvas_bench": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=", + "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732", + "url": "https://chromium.googlesource.com/chromium/canvas_bench.git" + }, + "src/chrome/test/data/perf/frame_rate/content": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=", + "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9", + "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git" + }, + "src/chrome/test/data/xr/webvr_info": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=", + "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248", + "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git" + }, + "src/docs/website": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6pM0P5zXJQXNSQ7MaXSKEHfb7KmtztfhlNlS+i8ugD4=", + "rev": "82c1d3e5b812b35df1cb6a031f59616dc594d4f7", + "url": "https://chromium.googlesource.com/website.git" + }, + "src/electron": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-OErkW4OrDU9WJd8iqWAUZZ5qR4vuX+laLzwTt5OMrOc=", + "owner": "electron", + "repo": "electron", + "rev": "v32.1.1" + }, + "src/media/cdm/api": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=", + "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28", + "url": "https://chromium.googlesource.com/chromium/cdm.git" + }, + "src/net/third_party/quiche/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-bFe79wg+PHRphP6I5q2wRheGTUARKx0zjyn3LxCie0s=", + "rev": "aecfea159d58ef53bd690688e4aca512fc4a3d35", + "url": "https://quiche.googlesource.com/quiche.git" + }, + "src/testing/libfuzzer/fuzzers/wasm_corpus": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qWsGQNUptbz0jYvUuxP7woNf5QQrfn9k3uvr82Yk0QM=", + "rev": "f650ff816f2ef227f61ea2e9f222aa69708ab367", + "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git" + }, + "src/third_party/accessibility_test_framework/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-mzVgoxxBWebesG6okyMxxmO6oH+TITA4o9ucHHMMzkQ=", + "rev": "4a764c690353ea136c82f1a696a70bf38d1ef5fe", + "url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git" + }, + "src/third_party/angle": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YV7RIbGq3zcnl4ZXJndjqbaPPDxCOzPJ87aH672mNq0=", + "rev": "713102774487cf1a8b3f433529eb8181cbcec31a", + "url": "https://chromium.googlesource.com/angle/angle.git" + }, + "src/third_party/angle/third_party/VK-GL-CTS/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-haO6KT+VbG/d2FljtsoJT7xghPTeEY5GPJdh2s9faVs=", + "rev": "5b2dfe7c775aa7b7909432944ba3535abcd25fc9", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS" + }, + "src/third_party/angle/third_party/glmark2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=", + "rev": "ca8de51fedb70bace5351c6b002eb952c747e889", + "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2" + }, + "src/third_party/angle/third_party/rapidjson/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", + "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f", + "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson" + }, + "src/third_party/anonymous_tokens/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-o/9lOnPR6vT0pkqWgenfyh9nI5Qoxyd030MNTfcoRSc=", + "rev": "76bfcccb6418239183df55111f2f24782d9f3680", + "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git" + }, + "src/third_party/beto-core/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-E2oaN2nbqG21qFhUtatsbXwC8KhoQadvU6BmYxF2lgs=", + "rev": "08537fdd2b0990270ea0214a61dfd318f293bc15", + "url": "https://beto-core.googlesource.com/beto-core.git" + }, + "src/third_party/boringssl/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-jZ9T5/6t1ImeCDBAMzW0aSmT/NcLxbESYv/F+cBjIFY=", + "rev": "f01108e4761e1d4189cb134322c3cb01dc71ef87", + "url": "https://boringssl.googlesource.com/boringssl.git" + }, + "src/third_party/breakpad/breakpad": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-QuMzYywRDzbwZHJrz/Gm/W6kclvBImRZCnGq8AbTxUY=", + "rev": "81819541a78c49e9109d2267462775e801f89ce6", + "url": "https://chromium.googlesource.com/breakpad/breakpad.git" + }, + "src/third_party/cast_core/public/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=", + "rev": "71f51fd6fa45fac73848f65421081edd723297cd", + "url": "https://chromium.googlesource.com/cast_core/public" + }, + "src/third_party/catapult": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-LIPOcMBxugyuYJ7IE1VszqLAWBBR58Ozy9VCRqVL208=", + "rev": "523ebded2f72a446544e2d9271ef39857f4e6ae7", + "url": "https://chromium.googlesource.com/catapult.git" + }, + "src/third_party/ced/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", + "rev": "ba412eaaacd3186085babcd901679a48863c7dd5", + "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git" + }, + "src/third_party/chromium-variations": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-E6deeWYQt2BxT+9Zb2VSXvZWCQI64Kf1dzUYAZJVA2s=", + "rev": "c134de595151ae72a112767e22da4448eb50e57f", + "url": "https://chromium.googlesource.com/chromium-variations.git" + }, + "src/third_party/clang-format/script": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-whD8isX2ZhLrFzdxHhFP1S/sZDRgyrzLFaVd7OEFqYo=", + "rev": "3c0acd2d4e73dd911309d9e970ba09d58bf23a62", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git" + }, + "src/third_party/cld_3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", + "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661", + "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git" + }, + "src/third_party/colorama/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", + "rev": "3de9f013df4b470069d03d250224062e8cf15c49", + "url": "https://chromium.googlesource.com/external/colorama.git" + }, + "src/third_party/content_analysis_sdk/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=", + "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc", + "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git" + }, + "src/third_party/cpu_features/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=", + "rev": "936b9ab5515dead115606559502e3864958f7f6e", + "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git" + }, + "src/third_party/cpuinfo/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-UKy9TIiO/UJ5w+qLRlMd085CX2qtdVH2W3rtxB5r6MY=", + "rev": "ca678952a9a8eaa6de112d154e8e104b22f9ab3f", + "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git" + }, + "src/third_party/crabbyavif/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-vnFxeAu6NMY6TOb2+LvGbCyOLbVD9R+utl/nnnCWVks=", + "rev": "716408df5cb6d43ebe31cb24194979b81a83b03c", + "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git" + }, + "src/third_party/crc32c/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=", + "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6", + "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git" + }, + "src/third_party/cros-components/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6XVrzfpQ8Rh99bCGbUkGd/zmFNgt4ZyRsyNvUkIfEyE=", + "rev": "39e57dd0d30ed019d6fb07c24b350f5fe78a1625", + "url": "https://chromium.googlesource.com/external/google3/cros_components.git" + }, + "src/third_party/cros_system_api": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Wq6XYQYAWzy3AurVkLGofFF4avntKIPmx6L7vPW2c2Q=", + "rev": "86bdf11581c80f776bfdf54db7f39f930fd6abaf", + "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git" + }, + "src/third_party/crossbench": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ICE5UkP91LHBT0vCpwKmdR+3ePnYcwnFroPUpJMKDvU=", + "rev": "b03a515f9e56280ecabfb254b188349d1a049827", + "url": "https://chromium.googlesource.com/crossbench.git" + }, + "src/third_party/dav1d/libdav1d": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-SlHTLgqaVST4pRstuzSBZmMx87I9TJ1c0qhClvU2sjI=", + "rev": "2355eeb8f254a1c34dbb0241be5c70cdf6ed46d1", + "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" + }, + "src/third_party/dawn": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-6ljZh99QPH8/9JAV1tVm6BVAYsJWqkJjzlM2AG2m01g=", + "rev": "5f86f5a316f4e082b2419d8b954ebb79c2be590d", + "url": "https://dawn.googlesource.com/dawn.git" + }, + "src/third_party/dawn/third_party/dxc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oIByfTUMy1EY3J0/m0iOqJbHd+DzpVAmZbaIdllcF04=", + "rev": "3ea0e7f6b5f464814d6b896eaf69cbd5ebe7fac4", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" + }, + "src/third_party/dawn/third_party/dxheaders": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", + "rev": "980971e835876dc0cde415e8f9bc646e64667bf7", + "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers" + }, + "src/third_party/dawn/third_party/glfw": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-E1zXIDiw87badrLOZTvV+Wh9NZHu51nb70ZK9vlAlqE=", + "rev": "b35641f4a3c62aa86a0b3c983d163bc0fe36026d", + "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw" + }, + "src/third_party/dawn/third_party/khronos/EGL-Registry": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", + "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry" + }, + "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", + "rev": "5bae8738b23d06968e7c3a41308568120943ae77", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry" + }, + "src/third_party/dawn/third_party/webgpu-cts": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-jDjxhMN+cXrf2+sCdp5GqhXuoO2EkoEijSx3PcYahpg=", + "rev": "5167b71635dfbfa5d4558de0da01923d446a5cd4", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts" + }, + "src/third_party/dawn/third_party/webgpu-headers": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-J3PcwYoO79HqrACFgk77BZLTCi7oi5k2J6v3wlcFVD4=", + "rev": "8049c324dc7b3c09dc96ea04cb02860f272c8686", + "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers" + }, + "src/third_party/depot_tools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Tc3x10zkgOvOqMap0xwsFd7W2l8ZyA923C0RRgw+jp0=", + "rev": "31e21628c3a558d4f2189712e25849d608b3ff8c", + "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" + }, + "src/third_party/devtools-frontend/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-agqi21oQNixRF+foVECaf4MiDVQdA308sLIgLGKiwYI=", + "rev": "47f04a536265028feb1254a3663853e0ce526455", + "url": "https://chromium.googlesource.com/devtools/devtools-frontend" + }, + "src/third_party/dom_distiller_js/dist": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", + "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d", + "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git" + }, + "src/third_party/eigen3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qmFsmFEQCDH+TRFc8+5BsYAG1ybL08fWhn8NpM6H6xY=", + "rev": "33d0937c6bdf5ec999939fb17f2a553183d14a74", + "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git" + }, + "src/third_party/electron_node": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-fYx771gbZTsgEmHQf4mj3qSqmFHs8YVg4sVyUnfsmqI=", + "owner": "nodejs", + "repo": "node", + "rev": "v20.17.0" + }, + "src/third_party/emoji-segmenter/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", + "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e", + "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git" + }, + "src/third_party/engflow-reclient-configs": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=", + "owner": "EngFlow", + "repo": "reclient-configs", + "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d" + }, + "src/third_party/expat/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-fr18LL/xX23t9TIn3q8jWdV9Y6coepbGsO3vJVdDW6k=", + "rev": "a59c3edffa54a77b8d7b268ef527da541076ca6a", + "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git" + }, + "src/third_party/farmhash/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", + "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45", + "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git" + }, + "src/third_party/ffmpeg": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-HVsENaBsYThsScvLwwuBT9dhjq5Acf3eskMIH+09mu0=", + "rev": "d941d9677bb4802f01750fd908ec284fb72c84df", + "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" + }, + "src/third_party/flac": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=", + "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c", + "url": "https://chromium.googlesource.com/chromium/deps/flac.git" + }, + "src/third_party/flatbuffers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-sdcZAL3ZHIHO9c1ko0xCfyii4jibwA+25RQkDa9XqTo=", + "rev": "fb9afbafc7dfe226b9db54d4923bfb8839635274", + "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git" + }, + "src/third_party/fontconfig/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00=", + "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267", + "url": "https://chromium.googlesource.com/external/fontconfig.git" + }, + "src/third_party/fp16/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=", + "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git" + }, + "src/third_party/freetype-testing/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", + "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f", + "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git" + }, + "src/third_party/freetype/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4WPGveEx3PoBpMlh1PyCJ3w5hdpXztzrXcTZfQ+7DtA=", + "rev": "37cefe33b284d0bad4ec52bcccc1a8c2d8704340", + "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" + }, + "src/third_party/fuzztest/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Go2Mrehkvk5fz2SlFrChMBnZJ3H8luhJU+M1TtqG7vg=", + "rev": "32eb84a95951fa3a0148fb3e6a1a02f830ded136", + "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" + }, + "src/third_party/fxdiv/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", + "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git" + }, + "src/third_party/gemmlowp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", + "rev": "13d57703abca3005d97b19df1f2db731607a7dc2", + "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git" + }, + "src/third_party/glslang/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-FhuQ4i8Xhy8FsEdAqJntffpo1vJRPsYdR5GFWXDtQD0=", + "rev": "dc9f6f61adaec755a09e1943cf7014c688443bcb", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang" + }, + "src/third_party/google_benchmark/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME=", + "rev": "344117638c8ff7e239044fd0fa7085839fc03021", + "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git" + }, + "src/third_party/googletest/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-iBR2otKeTc864DvCw0n7hpcn/4fHP+CIu2kLmBWym9M=", + "rev": "cee1ba1f24fb12b9ae8f31e70dca3f73dbb12cc2", + "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" + }, + "src/third_party/grpc/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", + "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737", + "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git" + }, + "src/third_party/harfbuzz-ng/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-iR49rfGDKxPObCff1/30hYHpP5FpZ28ROgMZhNk9eFY=", + "rev": "1da053e87f0487382404656edca98b85fe51f2fd", + "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git" + }, + "src/third_party/highway/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-PXsXIqWB4NNiFhanRjMIFSWYuW/IRuQo8mMPUBEentY=", + "rev": "8295336dd70f1201d42c22ab5b0861de38cf8fbf", + "url": "https://chromium.googlesource.com/external/github.com/google/highway.git" + }, + "src/third_party/hunspell_dictionaries": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=", + "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e", + "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git" + }, + "src/third_party/icu": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YlX+PaPhvYh9JzHT9WtS1beUK+cQrHGVUl+IBbv7GeQ=", + "rev": "9408c6fd4a39e6fef0e1c4077602e1c83b15f3fb", + "url": "https://chromium.googlesource.com/chromium/deps/icu.git" + }, + "src/third_party/instrumented_libs": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kHKGADAgzlaeckXFbpU1GhJK+zkiRd9XvdtPF6qrQFY=", + "rev": "bb6dbcf2df7a9beb34c3773ef4df161800e3aed9", + "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git" + }, + "src/third_party/jsoncpp/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", + "rev": "42e892d96e47b1f6e29844cc705e148ec4856448", + "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git" + }, + "src/third_party/leveldatabase/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TTX2FrmcWsgqrh4uzqMyGnnnG51cVC2ILfdLxD65MLY=", + "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea", + "url": "https://chromium.googlesource.com/external/leveldb.git" + }, + "src/third_party/libFuzzer/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-T0dO+1A0r6kLFoleMkY8heu80biPntCpvA6YfqA7b+E=", + "rev": "758bd21f103a501b362b1ca46fa8fcb692eaa303", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git" + }, + "src/third_party/libaddressinput/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=", + "rev": "e8712e415627f22d0b00ebee8db99547077f39bd", + "url": "https://chromium.googlesource.com/external/libaddressinput.git" + }, + "src/third_party/libaom/source/libaom": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-igHNDa/Jch0hiwDczrDOdrnGL4nMZMRevwX3AsYiUQ0=", + "rev": "93b8eee4f428675195c5c76e8da719ff50c2a01c", + "url": "https://aomedia.googlesource.com/aom.git" + }, + "src/third_party/libavif/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-aol16YtRFF1xQYXNRIZf4QMf5+ba09aDMEBx4lcAbWI=", + "rev": "03acd65314fe29e6627cf4eab752819f6ee15d74", + "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git" + }, + "src/third_party/libavifinfo/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-61OPjdMCIbHvWncmBzNw6sqlHcuc1kyqm9k1j4UTcZ0=", + "rev": "8d8b58a3f517ef8d1794baa28ca6ae7d19f65514", + "url": "https://aomedia.googlesource.com/libavifinfo.git" + }, + "src/third_party/libc++/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-vRRQW+ekjNpstfUI+OOA6rxwJp/OjRhfStmGEb/fOFg=", + "rev": "6bb75caa139ee1e686d2205910454cf6ea212e58", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" + }, + "src/third_party/libc++abi/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-tSIbtraD/pbqq4lCzgOakepXrSimCyry0WgcGAnkbwM=", + "rev": "a3c7d3e2f3e1e724b4651891b1a71257cbd88acc", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" + }, + "src/third_party/libdrm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-NUxS2rBJ0nFblvHRQUfKT933+DAws5RUTDb+RLxRF4M=", + "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1", + "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git" + }, + "src/third_party/libgav1/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-+ss9S5t+yoHzqbtX68+5OyyUbJVecYLwp+C3EXfAziE=", + "rev": "a2f139e9123bdb5edf7707ac6f1b73b3aa5038dd", + "url": "https://chromium.googlesource.com/codecs/libgav1.git" + }, + "src/third_party/libipp/libipp": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=", + "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f", + "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git" + }, + "src/third_party/libjpeg_turbo": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-UhDKDfAgcCS92R2EvxKpoiJMvakUDQgyHu2k/xeE7do=", + "rev": "ccfbe1c82a3b6dbe8647ceb36a3f9ee711fba3cf", + "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git" + }, + "src/third_party/liblouis/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", + "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376", + "url": "https://chromium.googlesource.com/external/liblouis-github.git" + }, + "src/third_party/libphonenumber/dist": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=", + "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362", + "url": "https://chromium.googlesource.com/external/libphonenumber.git" + }, + "src/third_party/libprotobuf-mutator/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=", + "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf", + "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git" + }, + "src/third_party/libsrtp": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-XOPiDAOHpWyCiXI+fi1CAie0Zaj4v14m9Kc8+jbzpUY=", + "rev": "7a7e64c8b5a632f55929cb3bb7d3e6fb48c3205a", + "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git" + }, + "src/third_party/libsync/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=", + "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6", + "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git" + }, + "src/third_party/libunwind/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-uUiAqW0OoB+ZWnTFpk2PJqI7kO9WgYLHiHkz8jikSKA=", + "rev": "d09db732ff68f40fd3581306c650b17ea1955b4e", + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" + }, + "src/third_party/libvpx/source/libvpx": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-uG9dnz4l28RB8R1AZBR97Fz7RN/ZYknP0/RffR1FJ1g=", + "rev": "057e53d759ac05417bbc7880b1d2e2ac7f08fc67", + "url": "https://chromium.googlesource.com/webm/libvpx.git" + }, + "src/third_party/libwebm/source": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-u/5nkJed0DzdhR5OLL2kIhZhOnrbyzL1Kx37vV/jcEo=", + "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da", + "url": "https://chromium.googlesource.com/webm/libwebm.git" + }, + "src/third_party/libwebp/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-xuRpEwOnaLGZmrPvfUn3DSoJANd94CG+JXcN7Mdmk5I=", + "rev": "845d5476a866141ba35ac133f856fa62f0b7445f", + "url": "https://chromium.googlesource.com/webm/libwebp.git" + }, + "src/third_party/libyuv": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hD5B9fPNwf8M98iS/PYeUJgJxtBvvf2BrrlnBNYXSg0=", + "rev": "a6a2ec654b1be1166b376476a7555c89eca0c275", + "url": "https://chromium.googlesource.com/libyuv/libyuv.git" + }, + "src/third_party/lss": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=", + "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521", + "url": "https://chromium.googlesource.com/linux-syscall-support.git" + }, + "src/third_party/material_color_utilities/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Y85XU+z9W6tvmDNHJ/dXQnUKXvvDkO3nH/kUJRLqbc4=", + "rev": "13434b50dcb64a482cc91191f8cf6151d90f5465", + "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git" + }, + "src/third_party/minigbm/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", + "rev": "3018207f4d89395cc271278fb9a6558b660885f5", + "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git" + }, + "src/third_party/nan": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=", + "owner": "nodejs", + "repo": "nan", + "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213" + }, + "src/third_party/nasm": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY=", + "rev": "f477acb1049f5e043904b87b825c5915084a9a29", + "url": "https://chromium.googlesource.com/chromium/deps/nasm.git" + }, + "src/third_party/nearby/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-1cj+yG9B9hEvPiGW0jGJhiFG882l56PvgEUXyCBFsSk=", + "rev": "76651429b8f96fc6c80949ba8f4e18c4b738e216", + "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git" + }, + "src/third_party/neon_2_sse/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=", + "rev": "a15b489e1222b2087007546b4912e21293ea86ff", + "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git" + }, + "src/third_party/openh264/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c=", + "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7", + "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264" + }, + "src/third_party/openscreen/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-x/SiWPBPeU2Rg7WqrwZcFvDk2J8ILTXyMEGix8r+7Js=", + "rev": "4f7c05781bc43e93706b0330eb830e2bc33fcb6c", + "url": "https://chromium.googlesource.com/openscreen" + }, + "src/third_party/openscreen/src/buildtools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-suuxUL//BfAMmG8os8ChI7ic9EjGTi7y5kjxiAyrEQc=", + "rev": "4e0e9c73a0f26735f034f09a9cab2a5c0178536b", + "url": "https://chromium.googlesource.com/chromium/src/buildtools" + }, + "src/third_party/openscreen/src/third_party/tinycbor/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", + "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7", + "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git" + }, + "src/third_party/ots/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", + "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33", + "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git" + }, + "src/third_party/pdfium": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GRihOFfswz+cNDxU/6LHZLp6rVSuHhz+5apRXQapOnQ=", + "rev": "66c80ddf43e3c3181d404607dcdc0cf37fdf7675", + "url": "https://pdfium.googlesource.com/pdfium.git" + }, + "src/third_party/perfetto": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-zs3PFwBmIxSfAk4HZpKsezkyE9kqaFNTbFQ7MSCl20Y=", + "rev": "077d742d9f9738a0453e408560a283a7514c9e8e", + "url": "https://android.googlesource.com/platform/external/perfetto.git" + }, + "src/third_party/protobuf-javascript/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U=", + "rev": "e34549db516f8712f678fcd4bc411613b5cc5295", + "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript" + }, + "src/third_party/pthreadpool/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-R4YmNzWEELSkAws/ejmNVxqXDTJwcqjLU/o/HvgRn2E=", + "rev": "4fe0e1e183925bf8cfa6aae24237e724a96479b8", + "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git" + }, + "src/third_party/pyelftools": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=", + "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae", + "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git" + }, + "src/third_party/pywebsocket3/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", + "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git" + }, + "src/third_party/quic_trace/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", + "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc", + "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git" + }, + "src/third_party/re2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc=", + "rev": "6dcd83d60f7944926bfd308cc13979fc53dd69ca", + "url": "https://chromium.googlesource.com/external/github.com/google/re2.git" + }, + "src/third_party/ruy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4NVvqUZn2BdwTxJINTHwPeRqbGXZrWdcd7jv1Y+eoKY=", + "rev": "c08ec529fc91722bde519628d9449258082eb847", + "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git" + }, + "src/third_party/securemessage/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", + "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84", + "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git" + }, + "src/third_party/skia": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-B5zb35NkwR3yT58344iAOM1Kywn8Yr/TuNBSJcrxwh4=", + "rev": "938144dd79c6e3664a3c0bbd019daedddf655ffa", + "url": "https://skia.googlesource.com/skia.git" + }, + "src/third_party/smhasher/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=", + "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f", + "url": "https://chromium.googlesource.com/external/smhasher.git" + }, + "src/third_party/snappy/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=", + "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c", + "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git" + }, + "src/third_party/speedometer/v3.0": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=", + "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d", + "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" + }, + "src/third_party/spirv-cross/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=", + "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" + }, + "src/third_party/spirv-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5lRPxsfXGWimJ7jNtM6kJembcAz357ER8PwFXnh6o4E=", + "rev": "db5a00f8cebe81146cafabf89019674a3c4bf03d", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers" + }, + "src/third_party/spirv-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Uld5cLV+oD0wm8TxK0V15yiwrdiUbWGqPQEbtMW9Apg=", + "rev": "a0817526b8e391732632e6a887134be256a20a18", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools" + }, + "src/third_party/sqlite/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZDByCZjc0coy19a0/BkVAU8y/Fkt7FKgWtCwI5K0Tdo=", + "rev": "9e45bccab2b8de8140c1732b0ec490db0362f730", + "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git" + }, + "src/third_party/squirrel.mac": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=", + "owner": "Squirrel", + "repo": "Squirrel.Mac", + "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38" + }, + "src/third_party/squirrel.mac/vendor/Mantle": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", + "owner": "Mantle", + "repo": "Mantle", + "rev": "78d3966b3c331292ea29ec38661b25df0a245948" + }, + "src/third_party/squirrel.mac/vendor/ReactiveObjC": { + "fetcher": "fetchFromGitHub", + "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", + "owner": "ReactiveCocoa", + "repo": "ReactiveObjC", + "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" + }, + "src/third_party/swiftshader": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YGVv/wDle+VyO/Ue7wR004dl8nvO5GjmDeWsoC30+kc=", + "rev": "c4dfa69de7deecf52c6b53badbc8bb7be1a05e8c", + "url": "https://swiftshader.googlesource.com/SwiftShader.git" + }, + "src/third_party/text-fragments-polyfill/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=", + "rev": "c036420683f672d685e27415de0a5f5e85bdc23f", + "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git" + }, + "src/third_party/tflite/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-2iYz04vqZI1nbvtnMjjy6aE9PMzvpLhttNbTrEvhC4M=", + "rev": "f9122e774969459927e9d956674c0aac06eb3b68", + "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git" + }, + "src/third_party/ukey2/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", + "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47", + "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git" + }, + "src/third_party/vulkan-deps": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-88nATFDj0QqE57ZH7effuNXByjYwGI58SYiAdvyjrt8=", + "rev": "d8095b45a0b2dcc2a85327ff4cc306c618dfa39a", + "url": "https://chromium.googlesource.com/vulkan-deps" + }, + "src/third_party/vulkan-headers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5gslQRGEeHu7lshmlM6SON+P6cKTGOYrmwkBRmu9NIw=", + "rev": "fabe9e2672334fdb9a622d42a2e8f94578952082", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" + }, + "src/third_party/vulkan-loader/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-CwBKsSCvrhp8gw9zm5lw+aJ/lzYksXd5zGZw0abw2JY=", + "rev": "5892ebe2d7505c2238a643288d9a5b2e68784a36", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader" + }, + "src/third_party/vulkan-tools/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-BraOoeYPOaLw7LfqnG+bZHQiJtWByYjnUU8Gw5ee29k=", + "rev": "2cee0d5b1d8c34e26fd6d9992d3d428ac4c5139d", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" + }, + "src/third_party/vulkan-utility-libraries/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-0p4CEh0BzMXRDxOh72QIPUjhYFB+9cna2bRtJXEGE/M=", + "rev": "67522b34edde86dbb97e164280291f387ade55fc", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries" + }, + "src/third_party/vulkan-validation-layers/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ompMbxRxa0acD/+a830N0VL88s1GepOO0e8Rkg5Nmjk=", + "rev": "919599474e6e6639527e7c3775ed1064665412d3", + "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers" + }, + "src/third_party/vulkan_memory_allocator": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=", + "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21", + "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git" + }, + "src/third_party/wayland-protocols/gtk": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", + "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0", + "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git" + }, + "src/third_party/wayland-protocols/kde": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", + "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e", + "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git" + }, + "src/third_party/wayland-protocols/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-5gWBte8oiuXM01StvyXFAsxFwuQZHjZT/LZ6l0mvrwI=", + "rev": "c7e9c4f5d396cda4051e49b15d7d0e4f91e4efac", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git" + }, + "src/third_party/wayland/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Cxu9+Kzw2t1BDfuGzNobaraT4eJcSPO7jvnHpuUANoo=", + "rev": "31577177454b89db37ceabd94e1640d398adbc87", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git" + }, + "src/third_party/webdriver/pylib": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=", + "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04", + "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git" + }, + "src/third_party/webgl/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-Yn0e1bpvtD4mGdZaRiBytc+upLulYVyHJqXJiTWEfmA=", + "rev": "1b6371436a0a60e6b9a4ae2a40a8eba198e3af02", + "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git" + }, + "src/third_party/webgpu-cts/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-4ZDhNhd4kh2lT47PV9zBISNmZDqxZO8WY+pTtxajEfw=", + "rev": "198d1770062c1a8aba86e7d6e001bb47bea028ee", + "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git" + }, + "src/third_party/webrtc": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-ZHkIEiazTp9MBDUufupLGeV97UEfjTwXxG87OUeHcog=", + "rev": "f237dc146debcfde3d70038c2b66f71bfea8d24b", + "url": "https://webrtc.googlesource.com/src.git" + }, + "src/third_party/weston/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=", + "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7", + "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git" + }, + "src/third_party/wuffs/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=", + "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8", + "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git" + }, + "src/third_party/xdg-utils": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=", + "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44", + "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git" + }, + "src/third_party/xnnpack/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-JO49N/vJz2nske13dcNFxC9hO7oO/1X6AsNnRCW/RqI=", + "rev": "8df2e765487685757ab5dabd12516cd0a24e3e25", + "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git" + }, + "src/third_party/zstd/src": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-sy6cs+c3t/XlwwJOMKCuBmoyrOiYHYeqsr/uOMVOdlI=", + "rev": "0ff651dd876823b99fa5c5f53292be28381aee9b", + "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git" + }, + "src/tools/page_cycler/acid3": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=", + "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba", + "url": "https://chromium.googlesource.com/chromium/deps/acid3.git" + }, + "src/v8": { + "fetcher": "fetchFromGitiles", + "hash": "sha256-bhGdJhSfvBFUh0PY9xssNinO1CKb36lxKuU3b35aV0M=", + "rev": "6f774f929205be0a49cf861b8d73a92655e1dd36", + "url": "https://chromium.googlesource.com/v8/v8.git" + } + }, + "electron_yarn_hash": "0jb1rs1in1bp71syim7a7p0n669kbc6as90y3zi6nd0q340cwgqa", + "modules": "128", + "node": "20.17.0", + "version": "32.1.1" } } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 228f5c3bfba2..5c637c3a20cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17161,7 +17161,7 @@ with pkgs; electron_29 = electron_29-bin; electron_30 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_30 then electron-source.electron_30 else electron_30-bin; electron_31 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_31 then electron-source.electron_31 else electron_31-bin; - electron_32 = electron_32-bin; + electron_32 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_32 then electron-source.electron_32 else electron_32-bin; electron = electron_31; electron-bin = electron_31-bin; electron-chromedriver = electron-chromedriver_31; From b075f7d893fcc0c05a80714354598067ff6ccd13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 19 Sep 2024 11:48:31 -0700 Subject: [PATCH 16/93] electron: 31 -> 32 --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c637c3a20cd..49e77e3eaecc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17162,9 +17162,9 @@ with pkgs; electron_30 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_30 then electron-source.electron_30 else electron_30-bin; electron_31 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_31 then electron-source.electron_31 else electron_31-bin; electron_32 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_32 then electron-source.electron_32 else electron_32-bin; - electron = electron_31; - electron-bin = electron_31-bin; - electron-chromedriver = electron-chromedriver_31; + electron = electron_32; + electron-bin = electron_32-bin; + electron-chromedriver = electron-chromedriver_32; autobuild = callPackage ../development/tools/misc/autobuild { }; From bac1f69114aace9b58a5eeb68c15ba9c7f1ae575 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 19 Sep 2024 13:30:32 -0700 Subject: [PATCH 17/93] electron-chromedriver_32: 32.1.0 -> 32.1.1 --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 213bc53abf74..f80b67c66eaf 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -34,13 +34,13 @@ }, "32": { "hashes": { - "aarch64-darwin": "8f40b497d21a8b7d2b3df168b1cf4311f6a39acab241f05ffee0dad6409e0801", - "aarch64-linux": "f92df0fafdf1be14d38a4ed4b1555f71c922ab3c096148c71aef8a46f95e0127", - "armv7l-linux": "f8c170268d348411fa5d27642327305aeca539459615a5e7648484728f4e0eed", - "headers": "01wwikj54d3fm6bsz9z61dcl7d5mzbk48mcaycrbmq1rg0h0kk5a", - "x86_64-darwin": "5efdf72e580336e91d6d696dab79ab9b932a2eaf91ff4da744b63da24f8288ca", - "x86_64-linux": "f48ca709758744f6c1ab5062444405c1416c27b57143707bfea321116f641cec" + "aarch64-darwin": "3fff987133294dcc18420500292bdfc32b452cfcf72f2e89af96404aa566aa27", + "aarch64-linux": "cfd75fdd5ec2bc86483b0779f241f98f775b74e4b75407a08b3755103304421a", + "armv7l-linux": "469d23434bca0f8bd4def7d3d9d3e9ff30dfa29e65450bac88cbbc0ae1ffc09c", + "headers": "0gw7yvj9i3kwmxbjj6w4l442saac3pcn3g7m42kvbpbwbfds1h4d", + "x86_64-darwin": "2b0e23c214580716dbeedd7b6bccc2b8994cbaa7827fa34208ed22ccb4ccdf77", + "x86_64-linux": "5d824770f97216138a209f268fbcab3de64bc967046ed9ad92ec0059abef184f" }, - "version": "32.1.0" + "version": "32.1.1" } } From f01b67406414907f2c95cd132003ae46590c757c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 19 Sep 2024 16:05:27 -0700 Subject: [PATCH 18/93] chromium: remove superfluous patch --- .../applications/networking/browsers/chromium/common.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index b0b5fbbe441a..1ef2e9d15382 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch +{ stdenv, lib, fetchpatch , recompressTarball , buildPackages , buildPlatform @@ -65,10 +65,6 @@ let python3WithPackages = python3.pythonOnBuildForHost.withPackages(ps: with ps; [ ply jinja2 setuptools ]); - clangFormatPython3 = fetchurl { - url = "https://chromium.googlesource.com/chromium/tools/build/+/e77882e0dde52c2ccf33c5570929b75b4a2a2522/recipes/recipe_modules/chromium/resources/clang-format?format=TEXT"; - hash = "sha256-1BRxXP+0QgejAWdFHJzGrLMhk/MsRDoVdK/GVoyFg0U="; - }; # The additional attributes for creating derivations based on the chromium # source tree. @@ -379,9 +375,6 @@ let # Allow to put extensions into the system-path. sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc - # We need the fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1254408: - base64 --decode ${clangFormatPython3} > buildtools/linux64/clang-format - # Add final newlines to scripts that do not end with one. # This is a temporary workaround until https://github.com/NixOS/nixpkgs/pull/255463 (or similar) has been merged, # as patchShebangs hard-crashes when it encounters files that contain only a shebang and do not end with a final From 05e13bffe19c8ccd425761798fba120242bac5f3 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 20 Sep 2024 12:54:58 -0300 Subject: [PATCH 19/93] nixosTests.k3s.{single-node,multi-node}: enable check-config for aarch64 --- nixos/tests/k3s/multi-node.nix | 4 +--- nixos/tests/k3s/single-node.nix | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/nixos/tests/k3s/multi-node.nix b/nixos/tests/k3s/multi-node.nix index 5fe106453f30..bc06ad858d8c 100644 --- a/nixos/tests/k3s/multi-node.nix +++ b/nixos/tests/k3s/multi-node.nix @@ -195,9 +195,7 @@ import ../make-test-python.nix ( server.wait_until_succeeds("k3s kubectl get node agent") for m in machines: - # Fix-Me: Tests fail for 'aarch64-linux' as: "CONFIG_CGROUP_FREEZER: missing (fail)" - if not is_aarch64: - m.succeed("k3s check-config") + m.succeed("k3s check-config") m.succeed( "${pauseImage} | k3s ctr image import -" ) diff --git a/nixos/tests/k3s/single-node.nix b/nixos/tests/k3s/single-node.nix index 145bce324299..b72936b4ab6a 100644 --- a/nixos/tests/k3s/single-node.nix +++ b/nixos/tests/k3s/single-node.nix @@ -83,10 +83,7 @@ import ../make-test-python.nix ( machine.wait_for_unit("k3s") machine.succeed("kubectl cluster-info") machine.fail("sudo -u noprivs kubectl cluster-info") - '' # Fix-Me: Tests fail for 'aarch64-linux' as: "CONFIG_CGROUP_FREEZER: missing (fail)" - + lib.optionalString (!pkgs.stdenv.isAarch64) ''machine.succeed("k3s check-config")'' - + '' - + machine.succeed("k3s check-config") machine.succeed( "${pauseImage} | ctr image import -" ) From e9002b6b547e171d943c2c1b0b78ce3e8ad1b207 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 20 Sep 2024 13:08:41 -0300 Subject: [PATCH 20/93] nixosTests.k3s.{single-node,multi-node}: nixfmt --- nixos/tests/k3s/single-node.nix | 57 ++++++++++++++++----------------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/nixos/tests/k3s/single-node.nix b/nixos/tests/k3s/single-node.nix index b72936b4ab6a..55a15324c88f 100644 --- a/nixos/tests/k3s/single-node.nix +++ b/nixos/tests/k3s/single-node.nix @@ -76,41 +76,40 @@ import ../make-test-python.nix ( }; }; - testScript = - '' - start_all() + testScript = '' + start_all() - machine.wait_for_unit("k3s") - machine.succeed("kubectl cluster-info") - machine.fail("sudo -u noprivs kubectl cluster-info") - machine.succeed("k3s check-config") - machine.succeed( - "${pauseImage} | ctr image import -" - ) + machine.wait_for_unit("k3s") + machine.succeed("kubectl cluster-info") + machine.fail("sudo -u noprivs kubectl cluster-info") + machine.succeed("k3s check-config") + machine.succeed( + "${pauseImage} | ctr image import -" + ) - # Also wait for our service account to show up; it takes a sec - machine.wait_until_succeeds("kubectl get serviceaccount default") - machine.succeed("kubectl apply -f ${testPodYaml}") - machine.succeed("kubectl wait --for 'condition=Ready' pod/test") - machine.succeed("kubectl delete -f ${testPodYaml}") + # Also wait for our service account to show up; it takes a sec + machine.wait_until_succeeds("kubectl get serviceaccount default") + machine.succeed("kubectl apply -f ${testPodYaml}") + machine.succeed("kubectl wait --for 'condition=Ready' pod/test") + machine.succeed("kubectl delete -f ${testPodYaml}") - # regression test for #176445 - machine.fail("journalctl -o cat -u k3s.service | grep 'ipset utility not found'") + # regression test for #176445 + machine.fail("journalctl -o cat -u k3s.service | grep 'ipset utility not found'") - with subtest("Run k3s-killall"): - # Call the killall script with a clean path to assert that - # all required commands are wrapped - output = machine.succeed("PATH= ${k3s}/bin/k3s-killall.sh 2>&1 | tee /dev/stderr") - assert "command not found" not in output, "killall script contains unknown command" + with subtest("Run k3s-killall"): + # Call the killall script with a clean path to assert that + # all required commands are wrapped + output = machine.succeed("PATH= ${k3s}/bin/k3s-killall.sh 2>&1 | tee /dev/stderr") + assert "command not found" not in output, "killall script contains unknown command" - # Check that killall cleaned up properly - machine.fail("systemctl is-active k3s.service") - machine.fail("systemctl list-units | grep containerd") - machine.fail("ip link show | awk -F': ' '{print $2}' | grep -e flannel -e cni0") - machine.fail("ip netns show | grep cni-") + # Check that killall cleaned up properly + machine.fail("systemctl is-active k3s.service") + machine.fail("systemctl list-units | grep containerd") + machine.fail("ip link show | awk -F': ' '{print $2}' | grep -e flannel -e cni0") + machine.fail("ip netns show | grep cni-") - machine.shutdown() - ''; + machine.shutdown() + ''; meta.maintainers = lib.teams.k3s.members; } From fc16ae75ec645650df14e93504d5f57fdfcfb123 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Fri, 20 Sep 2024 23:26:41 +0200 Subject: [PATCH 21/93] dub-to-nix: update recommended regen command --- pkgs/build-support/dlang/dub-to-nix/dub-to-nix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/dlang/dub-to-nix/dub-to-nix.py b/pkgs/build-support/dlang/dub-to-nix/dub-to-nix.py index fbb51960ad7b..b3cd3e511f09 100644 --- a/pkgs/build-support/dlang/dub-to-nix/dub-to-nix.py +++ b/pkgs/build-support/dlang/dub-to-nix/dub-to-nix.py @@ -13,7 +13,7 @@ def eprint(text: str): if not os.path.exists("dub.selections.json"): eprint("The file `dub.selections.json` does not exist in the current working directory") - eprint("run `dub upgrade --annotate` to generate it") + eprint("run `dub upgrade` to generate it") sys.exit(1) with open("dub.selections.json") as f: From c59b120d008ac7632dfc678b058335b51197fefe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Sep 2024 14:51:47 +0000 Subject: [PATCH 22/93] python312Packages.billiard: 4.2.0 -> 4.2.1 --- pkgs/development/python-modules/billiard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index d3358fe64563..5c2e5937fdc7 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "billiard"; - version = "4.2.0"; + version = "4.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mjwxhMsnWqF6cy+T9lsgxSXT2fJTci0mqCGUgDreWiw="; + hash = "sha256-ErZBsMU5Bz/I0/W4t76ZiVZmXEIzx8H81mp+Z3xPs28="; }; nativeCheckInputs = [ From 148c0ec36ef03d2c9d12676fa4560d09821d01ea Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 18 Sep 2024 07:53:13 +0200 Subject: [PATCH 23/93] python312Packages.numpyro: 0.15.2 -> 0.15.3 Diff: https://github.com/pyro-ppl/numpyro/compare/0.15.2...0.15.3 Changelog: https://github.com/pyro-ppl/numpyro/releases/tag/0.15.3 --- pkgs/development/python-modules/numpyro/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/numpyro/default.nix b/pkgs/development/python-modules/numpyro/default.nix index dd5aca045f43..945a33ef0053 100644 --- a/pkgs/development/python-modules/numpyro/default.nix +++ b/pkgs/development/python-modules/numpyro/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchPypi, # build-system @@ -23,14 +22,12 @@ buildPythonPackage rec { pname = "numpyro"; - version = "0.15.2"; + version = "0.15.3"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchPypi { inherit version pname; - hash = "sha256-6G3TrDyQ5N2uuzLzzEus1czCtvg3M0wBorLo2vQZozE="; + hash = "sha256-9EXurmIA+IPXkNZc4p/yRfepY5usMyLZk+zPkcRAI7M="; }; build-system = [ setuptools ]; From a620edff970d716ebb1aa37d445569780fa7fb42 Mon Sep 17 00:00:00 2001 From: pinage404 Date: Sat, 14 Sep 2024 18:38:36 +0200 Subject: [PATCH 24/93] maestro: refactor prefer finalAttrs instead of rec maestro: add metadata --- pkgs/by-name/ma/maestro/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/maestro/package.nix b/pkgs/by-name/ma/maestro/package.nix index 37adfb274d29..45f596d73e22 100644 --- a/pkgs/by-name/ma/maestro/package.nix +++ b/pkgs/by-name/ma/maestro/package.nix @@ -7,12 +7,12 @@ jre_headless, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "maestro"; version = "1.37.9"; src = fetchurl { - url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip"; + url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${finalAttrs.version}/maestro.zip"; hash = "sha256-bWZuD2+v6molwW1ef2a3djBnVfYscBjILLGXeeSUmoU="; }; @@ -38,7 +38,9 @@ stdenv.mkDerivation rec { homepage = "https://maestro.mobile.dev/"; license = licenses.asl20; platforms = lib.platforms.all; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; changelog = "https://github.com/mobile-dev-inc/maestro/blob/main/CHANGELOG.md"; maintainers = with maintainers; [ SubhrajyotiSen ]; + mainProgram = "maestro"; }; -} +}) From d0f192a58336d56170698b24fb807da3d87e53a5 Mon Sep 17 00:00:00 2001 From: pinage404 Date: Sat, 14 Sep 2024 18:35:49 +0200 Subject: [PATCH 25/93] maestro: add script to auto update to the latest stable version use the following comamnd to update ```sh nix-update --use-update-script maestro ``` --- pkgs/by-name/ma/maestro/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/ma/maestro/package.nix b/pkgs/by-name/ma/maestro/package.nix index 45f596d73e22..31be50e0c20c 100644 --- a/pkgs/by-name/ma/maestro/package.nix +++ b/pkgs/by-name/ma/maestro/package.nix @@ -5,6 +5,7 @@ unzip, makeWrapper, jre_headless, + writeScript, }: stdenv.mkDerivation (finalAttrs: { @@ -33,6 +34,16 @@ stdenv.mkDerivation (finalAttrs: { wrapProgram $out/bin/maestro --prefix PATH : "${lib.makeBinPath [ jre_headless ]}" ''; + passthru.updateScript = writeScript "update-maestro" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + set -o errexit -o nounset -o pipefail + + NEW_VERSION=$(curl --silent https://api.github.com/repos/mobile-dev-inc/maestro/releases | jq 'first(.[].tag_name | ltrimstr("cli-") | select(contains("dev.") | not))' --raw-output) + + update-source-version "maestro" "$NEW_VERSION" --print-changes + ''; + meta = with lib; { description = "Mobile UI Automation tool"; homepage = "https://maestro.mobile.dev/"; From 011eee0c557963d0e46bf7729cb573f31d4ed4a2 Mon Sep 17 00:00:00 2001 From: pinage404 Date: Sat, 14 Sep 2024 19:35:55 +0200 Subject: [PATCH 26/93] maestro: 1.37.9 -> 1.38.1 --- pkgs/by-name/ma/maestro/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/maestro/package.nix b/pkgs/by-name/ma/maestro/package.nix index 31be50e0c20c..e0f83c3ba4d1 100644 --- a/pkgs/by-name/ma/maestro/package.nix +++ b/pkgs/by-name/ma/maestro/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "maestro"; - version = "1.37.9"; + version = "1.38.1"; src = fetchurl { url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${finalAttrs.version}/maestro.zip"; - hash = "sha256-bWZuD2+v6molwW1ef2a3djBnVfYscBjILLGXeeSUmoU="; + hash = "sha256-AogEVg8R73x5Q/LxZamGbFacCqB8JZeERqyf+UPXBx0="; }; dontUnpack = true; From 23a7d90d468d8dd03c2ffa96ee15f8d4de0b5785 Mon Sep 17 00:00:00 2001 From: John Garcia Date: Sun, 22 Sep 2024 12:21:30 +0100 Subject: [PATCH 27/93] mathematica: add chewblacka to maintainers --- pkgs/applications/science/math/mathematica/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 9e2552478765..f0eb255bcda3 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -71,7 +71,7 @@ callPackage ./generic.nix { homepage = "http://www.wolfram.com/mathematica/"; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ herberteuler rafaelrc ]; + maintainers = with maintainers; [ herberteuler rafaelrc chewblacka ]; platforms = [ "x86_64-linux" ]; }; } From 78b5960d77303de3993f6c86fb2c9b35bc8cbd59 Mon Sep 17 00:00:00 2001 From: John Garcia Date: Sat, 21 Sep 2024 11:24:11 +0100 Subject: [PATCH 28/93] mathematica: 14.0.0 -> 14.1.0 --- .../science/math/mathematica/default.nix | 4 ++-- .../science/math/mathematica/generic.nix | 18 ++++++++++++------ .../science/math/mathematica/versions.nix | 14 ++++++++++++++ 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index f0eb255bcda3..9d0a308f4435 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -53,8 +53,8 @@ let versions = callPackage ./versions.nix { }; matchesDoc = v: builtins.match (if webdoc - then ".*[0-9]_LINUX.sh" - else ".*[0-9]_BNDL_LINUX.sh") v.src.name != null; + then ".*[0-9]_LIN(UX)?.sh" + else ".*_B[Nn][Dd][Ll].sh") v.src.name != null; in diff --git a/pkgs/applications/science/math/mathematica/generic.nix b/pkgs/applications/science/math/mathematica/generic.nix index c1c10f8937ce..6bf899230812 100644 --- a/pkgs/applications/science/math/mathematica/generic.nix +++ b/pkgs/applications/science/math/mathematica/generic.nix @@ -157,9 +157,15 @@ in stdenv.mkDerivation { mkdir -p "$out/lib/udev/rules.d" - # Patch MathInstaller's shebangs and udev rules dir - patchShebangs MathInstaller - substituteInPlace MathInstaller \ + # Set name of installer file + if [ -f "MathInstaller" ]; then + INSTALLER="MathInstaller" + else + INSTALLER="WolframInstaller" + fi + # Patch Installer's shebangs and udev rules dir + patchShebangs $INSTALLER + substituteInPlace $INSTALLER \ --replace /etc/udev/rules.d $out/lib/udev/rules.d # Remove PATH restriction, root and avahi daemon checks, and hostname call @@ -169,13 +175,13 @@ in stdenv.mkDerivation { s/^\s*checkAvahiDaemon$/:/ s/^\s*installBundledInstall$/:/ s/`hostname`/""/ - ' MathInstaller + ' $INSTALLER # NOTE: some files placed under HOME may be useful XDG_DATA_HOME="$out/share" HOME="$TMPDIR/home" vernierLink=y \ - ./MathInstaller -execdir="$out/bin" -targetdir="$out/libexec/Mathematica" -auto -verbose -createdir=y + ./$INSTALLER -execdir="$out/bin" -targetdir="$out/libexec/Mathematica" -auto -verbose -createdir=y - # Check if MathInstaller produced any errors + # Check if Installer produced any errors errLog="$out/libexec/Mathematica/InstallErrors" if [ -f "$errLog" ]; then echo "Installation errors:" diff --git a/pkgs/applications/science/math/mathematica/versions.nix b/pkgs/applications/science/math/mathematica/versions.nix index 98e65d376b39..a88aca6f12a8 100644 --- a/pkgs/applications/science/math/mathematica/versions.nix +++ b/pkgs/applications/science/math/mathematica/versions.nix @@ -7,6 +7,20 @@ */ let versions = [ + { + version = "14.1.0"; + lang = "en"; + language = "English"; + sha256 = "sha256-PCpjwqA6NC+iwvYxddYBlmF5+vl76r+MoIYAL91WFns="; + installer = "Wolfram_14.1.0_LIN.sh"; + } + { + version = "14.1.0"; + lang = "en"; + language = "English"; + sha256 = "sha256-pnu60Pv3xo3+MAkDLiU3yTPVbbQ00diV45vSVL8B310="; + installer = "Wolfram_14.1.0_LIN_Bndl.sh"; + } { version = "14.0.0"; lang = "en"; From b1b9fa4c85a2c3a9769c7a8bbd9338ef63d0dd48 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 22 Sep 2024 09:36:41 -0400 Subject: [PATCH 29/93] python312Packages.billiard: modernize, fetch source from github --- .../python-modules/billiard/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index 5c2e5937fdc7..ac2d7a828b85 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -1,7 +1,8 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + setuptools, pytestCheckHook, psutil, pythonOlder, @@ -10,15 +11,19 @@ buildPythonPackage rec { pname = "billiard"; version = "4.2.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-ErZBsMU5Bz/I0/W4t76ZiVZmXEIzx8H81mp+Z3xPs28="; + src = fetchFromGitHub { + owner = "celery"; + repo = "billiard"; + rev = "refs/tags/v${version}"; + hash = "sha256-9LuAlIn6hNiZGvWuaaDQxx9g0aBVF6Z2krxEOrssqRs="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ psutil pytestCheckHook From 7d392af757cb523b072497acb255d06918d53148 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 22 Sep 2024 09:39:10 -0400 Subject: [PATCH 30/93] python312Packages.billiard: drop outdated disabledTests --- pkgs/development/python-modules/billiard/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index ac2d7a828b85..428ed4da40a3 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -29,11 +29,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # psutil.NoSuchProcess: process no longer exists (pid=168) - "test_set_pdeathsig" - ]; - pythonImportsCheck = [ "billiard" ]; meta = with lib; { From 128a7c7fe5c721e9535799346e0d20c8f1d15261 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 22 Sep 2024 09:39:46 -0400 Subject: [PATCH 31/93] python312Packages.billiard: add nickcao to maintainers --- pkgs/development/python-modules/billiard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index 428ed4da40a3..4604eb15f43d 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -31,11 +31,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "billiard" ]; - meta = with lib; { + meta = { description = "Python multiprocessing fork with improvements and bugfixes"; homepage = "https://github.com/celery/billiard"; changelog = "https://github.com/celery/billiard/blob/v${version}/CHANGES.txt"; - license = licenses.bsd3; - maintainers = [ ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ nickcao ]; }; } From 62030f7bdd6f395ebd8b999da4d743ce4654f7ca Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 17 Sep 2024 13:25:42 -0300 Subject: [PATCH 32/93] previewqt: adopt and modernize - finalAttrs - strictDeps --- pkgs/by-name/pr/previewqt/package.nix | 108 +++++++++++++++++--------- 1 file changed, 71 insertions(+), 37 deletions(-) diff --git a/pkgs/by-name/pr/previewqt/package.nix b/pkgs/by-name/pr/previewqt/package.nix index 82508c4df5d3..4014fa91050e 100644 --- a/pkgs/by-name/pr/previewqt/package.nix +++ b/pkgs/by-name/pr/previewqt/package.nix @@ -1,64 +1,98 @@ { lib, - vips, - resvg, - mpv, - libraw, - imagemagick, - libdevil, - stdenv, - fetchFromGitLab, cmake, - libarchive, - qt6Packages, - extra-cmake-modules, exiv2, + extra-cmake-modules, + fetchFromGitLab, + imagemagick, + libarchive, + libdevil, + libraw, + mpv, + pkg-config, + qt6Packages, + resvg, + stdenv, + vips, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "previewqt"; version = "3.0"; src = fetchFromGitLab { + name = "previewqt-sources-${finalAttrs.version}"; owner = "lspies"; repo = "previewqt"; - rev = "refs/tags/v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-cDtqgezKGgSdhw8x1mM4cZ0H3SfUPEyWP6rRD+kRwXc="; }; - # can't find qtquick3d - strictDeps = false; - nativeBuildInputs = [ cmake - extra-cmake-modules + pkg-config qt6Packages.wrapQtAppsHook ]; - buildInputs = [ - exiv2 - imagemagick - qt6Packages.poppler - qt6Packages.qtmultimedia - qt6Packages.qtquick3d - qt6Packages.qtsvg - qt6Packages.qttools - qt6Packages.qtwebengine - libarchive - libdevil - libraw - mpv - resvg - vips - ]; + buildInputs = + [ + exiv2 + extra-cmake-modules + imagemagick + libarchive + libdevil + libraw + mpv + resvg + vips + ] + ++ [ + qt6Packages.poppler + qt6Packages.qtmultimedia + qt6Packages.qtquick3d + qt6Packages.qtsvg + qt6Packages.qttools + qt6Packages.qtwebengine + ]; + + strictDeps = true; meta = { + homepage = "https://previewqt.org/"; description = "Qt-based file previewer"; - homepage = "https://photoqt.org/previewqt"; - changelog = "https://gitlab.com/lspies/previewqt/-/blob/v${version}/CHANGELOG"; + longDescription = '' + PhotoQt is an image viewer that provides a simple and uncluttered + interface. Yet, hidden beneath the surface awaits a large array of + features. Here are some of its main features (not an exhaustive + list). Suggestions for new features are always welcome. + + - Support of ImageMagick/GraphicsMagick, Libraw, FreeImage, DevIL, + libvips, Poppler, libarchive, and video files. + - Touchscreen support + - Support for Motion Photos and Apple Live Photos + - Support for (partial) photo spheres and 360 degree panoramas using + equirectangular projection + - Explore images on an interactive map according to their embedded GPS + location + - Chromecast support + - Basic image manipulations + - Convert images between formats + - Keyboard and mouse shortcuts + - Upload images directly to imgur.com + - Set image as wallpaper directly from inside PhotoQt + - Slideshow feature + - Display Exif information (including tagging of faces) + - Detect and display bar codes and QR codes in images + - Thumbnail Cache + - System Tray Usage + - Command Line Options + - Several translations available (help wanted) + - and much more... + ''; + changelog = "https://gitlab.com/lspies/previewqt/-/blob/v${finalAttrs.version}/CHANGELOG"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ]; mainProgram = "previewqt"; + maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; }; -} +}) From 370458d7f179323121eb77a9157a0398c4104174 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sun, 22 Sep 2024 21:52:56 +0300 Subject: [PATCH 33/93] wine64Packages.{unstable,staging}: 9.17 -> 9.18 --- pkgs/applications/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index e41e8a61a196..cf517bfc0f1a 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "9.17"; + version = "9.18"; url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; - hash = "sha256-Ptt+tvMbtcP3N43VYj2p2V99TW18g3iv2JyOOjCqCAw="; + hash = "sha256-ZSb1IRwIVFO8tkKUbrLOjR1CqKSmgWi/Kg1z8yYS3Rw="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -117,7 +117,7 @@ in rec { staging = fetchFromGitLab rec { # https://gitlab.winehq.org/wine/wine-staging inherit (unstable) version; - hash = "sha256-ez7P9R5Q7t+FpaU5bVer4n2bt+evgXLJb83gP+zxIAw="; + hash = "sha256-m3tuwb6OFcgZ/NATixIH1j3YgrzsREJNpnVbevN/9FY="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; From 2e229394f61b1da67522cc56692cb4ef78775b5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20Ol=C3=A1h?= Date: Sun, 22 Sep 2024 21:24:32 +0200 Subject: [PATCH 34/93] maintainers: add attila --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 67481034a7ee..41dfcb18fc7e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2028,6 +2028,13 @@ github = "Atry"; githubId = 601530; }; + attila = { + name = "Attila Oláh"; + email = "attila@dorn.haus"; + github = "attilaolah"; + githubId = 196617; + keys = [ { fingerprint = "BF2E 4759 74D3 88E0 E30C 9604 07E6 C064 3FD1 42C3"; } ]; + }; auchter = { name = "Michael Auchter"; email = "a@phire.org"; From 100eefb99c640ea73432fc5bbc816e379d269182 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Sep 2024 21:25:50 +0000 Subject: [PATCH 35/93] dopamine: 3.0.0-preview.33 -> 3.0.0-preview.34 --- pkgs/by-name/do/dopamine/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/dopamine/package.nix b/pkgs/by-name/do/dopamine/package.nix index 0b05839f1976..10a45cbb2b42 100644 --- a/pkgs/by-name/do/dopamine/package.nix +++ b/pkgs/by-name/do/dopamine/package.nix @@ -6,11 +6,11 @@ }: appimageTools.wrapType2 rec { pname = "dopamine"; - version = "3.0.0-preview.33"; + version = "3.0.0-preview.34"; src = fetchurl { url = "https://github.com/digimezzo/dopamine/releases/download/v${version}/Dopamine-${version}.AppImage"; - hash = "sha256-W8XkXnsP0AqYV0wznKe1dbPm2VuhoZWl03G7hib/uxE="; + hash = "sha256-K4dDYYzo2oMAZvlb25cQuh1G187efSyJfAA6jdCKaT0="; }; extraInstallCommands = From 50b9f412af62e081ed95150b9831f1d65bfcbaf7 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 22 Sep 2024 16:35:05 +0100 Subject: [PATCH 36/93] hydrus: use the native test runner This eliminates a nose dependency and lets us actually run all the tests. Even though it throws up exceptions about the missing SWF tools, I have verified that the tests are actually getting run properly (i.e., if you adjust an assertion to compare against bogus values, the build does fail). --- pkgs/applications/graphics/hydrus/default.nix | 45 +++++-------------- 1 file changed, 11 insertions(+), 34 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 60d5e22a4c89..d4def73be883 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -83,44 +83,10 @@ python3Packages.buildPythonPackage rec { ]; nativeCheckInputs = with python3Packages; [ - nose mock httmock ]; - # most tests are failing, presumably because we are not using test.py - checkPhase = '' - runHook preCheck - - nosetests $src/hydrus/test \ - -e TestClientAPI \ - -e TestClientConstants \ - -e TestClientDaemons \ - -e TestClientData \ - -e TestClientDB \ - -e TestClientDBDuplicates \ - -e TestClientDBTags \ - -e TestClientImageHandling \ - -e TestClientImportOptions \ - -e TestClientListBoxes \ - -e TestClientMigration \ - -e TestClientNetworking \ - -e TestClientTags \ - -e TestClientThreading \ - -e TestDialogs \ - -e TestFunctions \ - -e TestHydrusNetwork \ - -e TestHydrusNATPunch \ - -e TestHydrusSerialisable \ - -e TestHydrusServer \ - -e TestHydrusSessions \ - -e TestServer \ - -e TestClientMetadataMigration \ - -e TestClientFileStorage \ - - runHook postCheck - ''; - outputs = [ "out" "doc" ]; installPhase = '' @@ -140,6 +106,7 @@ python3Packages.buildPythonPackage rec { mkdir -p $out/bin install -m0755 hydrus_server.py $out/bin/hydrus-server install -m0755 hydrus_client.py $out/bin/hydrus-client + install -m0755 hydrus_test.py $out/bin/hydrus-test # desktop item mkdir -p "$out/share/icons/hicolor/scalable/apps" @@ -154,6 +121,16 @@ python3Packages.buildPythonPackage rec { runHook postInstall ''; + checkPhase = '' + runHook preCheck + + export QT_QPA_PLATFORM=offscreen + export HOME=$(mktemp -d) + $out/bin/hydrus-test + + runHook postCheck + ''; + dontWrapQtApps = true; preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") From 6ae535b3a6972d7b37a7878dd9adb98125fcd51e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Sep 2024 23:26:00 +0000 Subject: [PATCH 37/93] astartectl: 24.5.0 -> 24.5.2 --- pkgs/by-name/as/astartectl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/as/astartectl/package.nix b/pkgs/by-name/as/astartectl/package.nix index a22f6bd598f1..ac88b96cfab7 100644 --- a/pkgs/by-name/as/astartectl/package.nix +++ b/pkgs/by-name/as/astartectl/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "astartectl"; - version = "24.5.0"; + version = "24.5.2"; src = fetchFromGitHub { owner = "astarte-platform"; repo = "astartectl"; rev = "v${version}"; - hash = "sha256-4Iyd+1hLSatWyeV2J7RSqo2jVEc8dSp5JBObsn3RciI="; + hash = "sha256-T4/lkeipE7GWq1zTxkoV3MfADlduFKtGuB/dsI4YZZw="; }; - vendorHash = "sha256-NWPLHbUHrk/oJXCOJF8kKhQiZR8aqZChxuz73Acu1cM="; + vendorHash = "sha256-kVI1DigDlTvrYLVRUYoW+AAkd31d9EehjRJxrqo8OB4="; nativeBuildInputs = [ installShellFiles ]; From 17ddf8b3fc50386a26bab5e1ff33c55c605a46af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Sep 2024 23:26:01 +0000 Subject: [PATCH 38/93] arkade: 0.11.24 -> 0.11.26 --- pkgs/applications/networking/cluster/arkade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 246327a44364..a484da72b6fb 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.11.24"; + version = "0.11.26"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-9g3SGfJLzn+WIkBGcCwgOaJSuSUSFSU8d/9NZlN0h8E="; + hash = "sha256-p3rLQQwuJ/5AUzsQfGA9JSoifYaG4vAE2NaNfTf6/uk="; }; CGO_ENABLED = 0; From d4c147cb9747c5b1801f2bd3a6b30f6855d1197e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Sep 2024 23:26:18 +0000 Subject: [PATCH 39/93] yandex-music: 5.15.0 -> 5.18.2 --- pkgs/by-name/ya/yandex-music/info.json | 6 +++--- pkgs/by-name/ya/yandex-music/package.nix | 4 ++-- pkgs/by-name/ya/yandex-music/ym_info.json | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ya/yandex-music/info.json b/pkgs/by-name/ya/yandex-music/info.json index 7564f59339cc..0223a0ae3ad3 100644 --- a/pkgs/by-name/ya/yandex-music/info.json +++ b/pkgs/by-name/ya/yandex-music/info.json @@ -1,7 +1,7 @@ { "branch": "master", - "commit_hash": "98fed92683e2e5a49999d04b5559edd02eddf627", + "commit_hash": "d446a98850abccfe28a78363c96468a2a8109cfc", "commit_message": "Update packages", - "date": "2024-09-10", - "tag": "v5.15.0" + "date": "2024-09-22", + "tag": "v5.18.2" } diff --git a/pkgs/by-name/ya/yandex-music/package.nix b/pkgs/by-name/ya/yandex-music/package.nix index a26e729d7b16..6ee96d54fdd6 100644 --- a/pkgs/by-name/ya/yandex-music/package.nix +++ b/pkgs/by-name/ya/yandex-music/package.nix @@ -14,13 +14,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "yandex-music"; - version = "5.15.0"; + version = "5.18.2"; src = fetchFromGitHub { owner = "cucumber-sp"; repo = "yandex-music-linux"; rev = "v${version}"; - hash = "sha256-c+OKyhbgpXMryc6QQH4b5cePlqyHeSfDh4kT2rU+Tpo="; + hash = "sha256-y+T2ckrnhrOiiPKBUlnvDb4FwrIfbaIXwVi16AoX/bQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ya/yandex-music/ym_info.json b/pkgs/by-name/ya/yandex-music/ym_info.json index 49ff918d36a8..cba72691edb9 100644 --- a/pkgs/by-name/ya/yandex-music/ym_info.json +++ b/pkgs/by-name/ya/yandex-music/ym_info.json @@ -1,9 +1,9 @@ { "ym": { - "version": "5.15.0", - "exe_name": "Yandex_Music_x64_5.15.0.exe", - "exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.15.0.exe", - "exe_sha256": "14396a25b35199f28175d3c15924ec75560cbae6f5fb6767ec7f326637723e36" + "version": "5.18.2", + "exe_name": "Yandex_Music_x64_5.18.2.exe", + "exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.18.2.exe", + "exe_sha256": "a513eb6aa4bd05bae8503f5578a8e91d778794ffe4eb3a450040903570106941" }, "electron": { "version": "29.4.6", From 64063ac42f7251f286c65364d68504adf5b5bd1f Mon Sep 17 00:00:00 2001 From: beviu Date: Mon, 23 Sep 2024 03:15:05 +0200 Subject: [PATCH 40/93] maintainers: add beviu --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3c19eaf793e6..2517ce524766 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2563,6 +2563,13 @@ githubId = 7346933; name = "betaboon"; }; + beviu = { + name = "beviu"; + email = "nixpkgs@beviu.com"; + github = "beviu"; + githubId = 56923875; + keys = [ { fingerprint = "30D6 A755 E3C3 5797 CBBB 05B6 CD20 2E66 5CAD 7D06"; } ]; + }; bew = { email = "benoit.dechezelles@gmail.com"; github = "bew"; From d8eefe56554757212964be878e5568d6d33aca1b Mon Sep 17 00:00:00 2001 From: beviu Date: Mon, 23 Sep 2024 03:15:20 +0200 Subject: [PATCH 41/93] autologin: init at 1.0.0 --- pkgs/by-name/au/autologin/package.nix | 41 +++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 pkgs/by-name/au/autologin/package.nix diff --git a/pkgs/by-name/au/autologin/package.nix b/pkgs/by-name/au/autologin/package.nix new file mode 100644 index 000000000000..091a2cb8ad5b --- /dev/null +++ b/pkgs/by-name/au/autologin/package.nix @@ -0,0 +1,41 @@ +{ + lib, + stdenv, + fetchFromSourcehut, + meson, + ninja, + pam, + nix-update-script, +}: + +stdenv.mkDerivation rec { + pname = "autologin"; + version = "1.0.0"; + + src = fetchFromSourcehut { + owner = "~kennylevinsen"; + repo = "autologin"; + rev = version; + hash = "sha256-Cy4v/1NuaiSr5Bl6SQMWk5rga8h1QMBUkHpN6M3bWOc="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + meson + ninja + ]; + buildInputs = [ pam ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Run a command inside of a new PAM user session"; + homepage = "https://sr.ht/~kennylevinsen/autologin"; + changelog = "https://git.sr.ht/~kennylevinsen/autologin/refs/${version}"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ beviu ]; + mainProgram = "autologin"; + }; +} From 7d7b6622fd63418bf4791a9815c29192fb60bedc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 01:18:04 +0000 Subject: [PATCH 42/93] gitlab-ci-ls: 0.21.1 -> 0.21.2 --- pkgs/by-name/gi/gitlab-ci-ls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitlab-ci-ls/package.nix b/pkgs/by-name/gi/gitlab-ci-ls/package.nix index 98c7c3949924..7468842c6468 100644 --- a/pkgs/by-name/gi/gitlab-ci-ls/package.nix +++ b/pkgs/by-name/gi/gitlab-ci-ls/package.nix @@ -10,15 +10,15 @@ rustPlatform.buildRustPackage rec { pname = "gitlab-ci-ls"; - version = "0.21.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "alesbrelih"; repo = "gitlab-ci-ls"; rev = "${version}"; - hash = "sha256-0aVwI+E/UmYDSQDArQZsaNc0jDXXOG/zDr/5o0I1aLw="; + hash = "sha256-wkL6ko43oWrpyscEpCMuoFamDMJk9+xI3qYOs+DgI8g="; }; - cargoHash = "sha256-rZXIc9O+pIdR/M8kV7judiHTCwnKcX+7P1LWEqZLeD8="; + cargoHash = "sha256-H/p29QbCaZRa81g+5eUsG47tUJPVgB1J9zZYY5/n5Vk="; nativeBuildInputs = [ pkg-config ]; buildInputs = From 2fcf878726c627ec8d487c0cf5f432167156648d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 01:18:13 +0000 Subject: [PATCH 43/93] libraqm: 0.10.1 -> 0.10.2 --- pkgs/development/libraries/libraqm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libraqm/default.nix b/pkgs/development/libraries/libraqm/default.nix index 98769f2e374a..9899c70b8089 100644 --- a/pkgs/development/libraries/libraqm/default.nix +++ b/pkgs/development/libraries/libraqm/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libraqm"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "HOST-Oman"; repo = "libraqm"; rev = "v${version}"; - sha256 = "sha256-H9W+7Mob3o5ctxfp5UhIxatSdXqqvkpyEibJx9TO7a8="; + sha256 = "sha256-KhGE66GS5rIieVXJUFA3jSsXEpbdnzN0VIAF/zOelU4="; }; buildInputs = [ freetype harfbuzz fribidi ]; From b050d14946c0de493562f9bde8dc19995591e89e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 01:41:25 +0000 Subject: [PATCH 44/93] noson: 5.6.7 -> 5.6.8 --- pkgs/applications/audio/noson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/noson/default.nix b/pkgs/applications/audio/noson/default.nix index 0184934ff220..bf2c115758c4 100644 --- a/pkgs/applications/audio/noson/default.nix +++ b/pkgs/applications/audio/noson/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "noson"; - version = "5.6.7"; + version = "5.6.8"; src = fetchFromGitHub { owner = "janbar"; repo = "noson-app"; rev = finalAttrs.version; - hash = "sha256-lroQYO+Ab7uPQmsrUFK6uWdCoGQp1klyfLw6eAxdzjg="; + hash = "sha256-hCVGi+++6CcTRMXeRKH8xRncm/Gl83GgU3aAIPI/yGU="; }; nativeBuildInputs = [ From ef9fc9852789b388ff79b161fd180539c923c639 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 01:59:10 +0000 Subject: [PATCH 45/93] ananicy-rules-cachyos: 0-unstable-2024-08-26 -> 0-unstable-2024-09-18 --- pkgs/by-name/an/ananicy-rules-cachyos/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index 695714175c50..c282aff0c4d7 100644 --- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix +++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "ananicy-rules-cachyos"; - version = "0-unstable-2024-08-26"; + version = "0-unstable-2024-09-18"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "a78b76536246898045fd1844aced381d01b7f1c6"; - hash = "sha256-bDfvWg5r4LmWI8tPrx9qzgEnJuMSYBm6MDf6yOaPqkY="; + rev = "1da705ebab9ab44bb933c1275961f963cc4440eb"; + hash = "sha256-6dVY0sZ09H5vdhfk5nGNjt+KG+Qw62b2YbJQCprXBPQ="; }; dontConfigure = true; From afeb3ec1dba10c9cf3c63d80c09bb1199804e778 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 02:34:14 +0000 Subject: [PATCH 46/93] rabtap: 1.42 -> 1.43 --- pkgs/tools/networking/rabtap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/rabtap/default.nix b/pkgs/tools/networking/rabtap/default.nix index d2570cdc21aa..05f552ea16e6 100644 --- a/pkgs/tools/networking/rabtap/default.nix +++ b/pkgs/tools/networking/rabtap/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rabtap"; - version = "1.42"; + version = "1.43"; src = fetchFromGitHub { owner = "jandelgado"; repo = "rabtap"; rev = "v${version}"; - sha256 = "sha256-+e8HHd2j8M2EJzfCQtohdlp+24JFZ1kA2/t+VSqFDAI="; + sha256 = "sha256-OUpDk6nfVbz/KP7vZeZV2JfbCzh/KcuxG015/uxYuEI="; }; - vendorHash = "sha256-uRlFzhHtpZSie4Fmtj9YUPn+c7+Gvimlk1q8CcXFYmg="; + vendorHash = "sha256-V7AkqmEbwuW2Ni9b00Zd22ugk9ScGWf5wauHcQwG7b0="; meta = with lib; { description = "RabbitMQ wire tap and swiss army knife"; From 4820dbad9c089c8c7a14b4346ca3df1c3d762f6a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 02:36:05 +0000 Subject: [PATCH 47/93] revive: 1.3.9 -> 1.4.0 --- pkgs/development/tools/revive/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/revive/default.nix b/pkgs/development/tools/revive/default.nix index 1c181c0efbe0..927eb7b43c5f 100644 --- a/pkgs/development/tools/revive/default.nix +++ b/pkgs/development/tools/revive/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "revive"; - version = "1.3.9"; + version = "1.4.0"; src = fetchFromGitHub { owner = "mgechev"; repo = pname; rev = "v${version}"; - hash = "sha256-ZfZNqr7zeMrLjSS1h3ZbjiXNjX1UiqldtrEFth2Z4f0="; + hash = "sha256-ViYNXZXvlOOpBjQuMAQXwcDtu1HoF+NstrOZzQcBOuQ="; # 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; @@ -18,7 +18,7 @@ buildGoModule rec { rm -rf $out/.git ''; }; - vendorHash = "sha256-iIAKPCE06lhAf/4f4TRVO51RdlvuXNA7yMlGVPGrIeo="; + vendorHash = "sha256-btuAXaJL8URkJvzPy+9tci5gOAqSkkNZn3mN2ox1Vfk="; ldflags = [ "-s" From e69b0ef60eacae43e8d8963561057798a0b44d2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 02:36:10 +0000 Subject: [PATCH 48/93] qrtool: 0.11.4 -> 0.11.5 --- pkgs/by-name/qr/qrtool/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix index bc79fb038f8e..1743b5e511d0 100644 --- a/pkgs/by-name/qr/qrtool/package.nix +++ b/pkgs/by-name/qr/qrtool/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "qrtool"; - version = "0.11.4"; + version = "0.11.5"; src = fetchFromGitHub { owner = "sorairolake"; repo = "qrtool"; rev = "v${version}"; - hash = "sha256-lD/xi2k5baZGUUixy/032jTBevr0uQIT/JmX+d+kPyA="; + hash = "sha256-2Msc8VTEzpK5eQHxJxNekj6YSqFRX/DN206hvYshiOg="; }; - cargoHash = "sha256-lR/LusIgdA+G7YeSLHjxdcC96tOSqSyalVamS42ORs0="; + cargoHash = "sha256-wBEimPiht7VN3lQfPlflrG2L47bfNnipK/JmurKqHrg="; nativeBuildInputs = [ asciidoctor From 491e455c5173ed2ffface5e2d8a1c6398e5a13d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 02:41:49 +0000 Subject: [PATCH 49/93] shadowsocks-rust: 1.20.4 -> 1.21.0 --- pkgs/tools/networking/shadowsocks-rust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index d9c834e0820a..01b42fc57b97 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.20.4"; + version = "1.21.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - hash = "sha256-UDr1/5PlK395CnWbp3eDTniltZYrFZ6raVBiqsVaCZs="; + hash = "sha256-B4RufyxqcKd5FJulKRV+33sos+cYrL2/QPmKEYw3aTU="; }; - cargoHash = "sha256-xrD0vImCZwaAaoVWC/Wlj6Gvm0COwmINJdlBlud9+7Y="; + cargoHash = "sha256-2uYLrYFuzvaOZxw2hN4DcrEbwW5rnXxqKoI2q6yZaGU="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; From 8658b1b6481baa7eda843cfd6d48d65327d3330d Mon Sep 17 00:00:00 2001 From: alexyao2015 <33379584+alexyao2015@users.noreply.github.com> Date: Mon, 23 Sep 2024 01:41:14 +0000 Subject: [PATCH 50/93] appimage-run: Add libsecret for bitwarden Previously running the Bitwarden AppImage would error. This adds libsecret which resolves the error and allows the Bitwarden AppImage to function normally. --- pkgs/build-support/appimage/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 6451feeabe3c..a6b08042db99 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -205,6 +205,8 @@ rec { at-spi2-core pciutils # for FreeCAD pipewire # immersed-vr wayland support + + libsecret # For bitwarden ]; }; } From 4ed45e0921f8abefaacae58cbb6f9bb0667320be Mon Sep 17 00:00:00 2001 From: Vedant <83997633+vedantmgoyal9@users.noreply.github.com> Date: Mon, 23 Sep 2024 09:40:33 +0530 Subject: [PATCH 51/93] aliae: remove static_build --- pkgs/by-name/al/aliae/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/al/aliae/package.nix b/pkgs/by-name/al/aliae/package.nix index 49e4c665ad52..7d8b7c73436e 100644 --- a/pkgs/by-name/al/aliae/package.nix +++ b/pkgs/by-name/al/aliae/package.nix @@ -32,7 +32,6 @@ buildGoModule rec { tags = [ "netgo" "osusergo" - "static_build" ]; postInstall = From f55aee66316a6215d7ae8cda7ae325d6783e2aaf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 23 Sep 2024 08:04:49 +0200 Subject: [PATCH 52/93] python312Packages.meteoswiss-async: init at 0.1.1 Asynchronous client library for MeteoSwiss API https://github.com/albertomontesg/meteoswiss-async --- .../meteoswiss-async/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/meteoswiss-async/default.nix diff --git a/pkgs/development/python-modules/meteoswiss-async/default.nix b/pkgs/development/python-modules/meteoswiss-async/default.nix new file mode 100644 index 000000000000..b837f49c08c6 --- /dev/null +++ b/pkgs/development/python-modules/meteoswiss-async/default.nix @@ -0,0 +1,52 @@ +{ + lib, + aiohttp, + asyncstdlib, + buildPythonPackage, + dataclasses-json, + fetchFromGitHub, + pytest-cov-stub, + pytest-mock, + pytestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "meteoswiss-async"; + version = "0.1.1"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "albertomontesg"; + repo = "meteoswiss-async"; + rev = "refs/tags/${version}"; + hash = "sha256-xFvfyLZvBfnbzShKN+94piNUVjV1cfi4jWpc/Xw6XG4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + asyncstdlib + dataclasses-json + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + pytest-cov-stub + ]; + + pythonImportsCheck = [ "meteoswiss_async" ]; + + meta = { + description = "Asynchronous client library for MeteoSwiss API"; + homepage = "https://github.com/albertomontesg/meteoswiss-async"; + changelog = "https://github.com/albertomontesg/meteoswiss-async/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a9231aecd6e8..d395c5c53618 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7820,6 +7820,8 @@ self: super: with self; { meteofrance-api = callPackage ../development/python-modules/meteofrance-api { }; + meteoswiss-async = callPackage ../development/python-modules/meteoswiss-async { }; + methodtools = callPackage ../development/python-modules/methodtools { }; mezzanine = callPackage ../development/python-modules/mezzanine { }; From 0010d951740bc74e6ab4c2f8a26c87ea9f2dd786 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 20 Sep 2024 21:08:18 +0800 Subject: [PATCH 53/93] boilr: run nixfmt --- pkgs/by-name/bo/boilr/package.nix | 37 +++++++++++++++++-------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/bo/boilr/package.nix b/pkgs/by-name/bo/boilr/package.nix index d7e95b5a8bf9..0cf3ff119dd3 100644 --- a/pkgs/by-name/bo/boilr/package.nix +++ b/pkgs/by-name/bo/boilr/package.nix @@ -1,16 +1,17 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, clangStdenv -, gtk3 -, xorg -, perl -, openssl -, speechd-minimal -, libxkbcommon -, libGL -, wayland +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + clangStdenv, + gtk3, + xorg, + perl, + openssl, + speechd-minimal, + libxkbcommon, + libGL, + wayland, }: let rpathLibs = [ @@ -38,7 +39,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { src = fetchFromGitHub { owner = "PhilipK"; repo = "BoilR"; - rev = "v.${version}"; + rev = "refs/tags/v.${version}"; hash = "sha256-bwCTsoZ/9TeO3wyEcOqxKePnj9glsDXWUBCLd3nVT80="; }; @@ -57,10 +58,12 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { dontPatchELF = true; meta = { - description = - "Automatically adds (almost) all your games to your Steam library (including image art)"; + description = "Automatically adds (almost) all your games to your Steam library (including image art)"; homepage = "https://github.com/PhilipK/BoilR"; - license = with lib.licenses; [ asl20 mit ]; + license = with lib.licenses; [ + asl20 + mit + ]; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ foolnotion ]; mainProgram = "boilr"; From be138083315257507575b68b3941bc6b70e5a832 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 06:59:39 +0000 Subject: [PATCH 54/93] uwsm: 0.19.0 -> 0.19.1 --- pkgs/by-name/uw/uwsm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix index 7df5b832c746..44611002f9ca 100644 --- a/pkgs/by-name/uw/uwsm/package.nix +++ b/pkgs/by-name/uw/uwsm/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "uwsm"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "Vladimir-csp"; repo = "uwsm"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-gptZld9BIQaujg9fGAgKD7wXjKeL5quXnSGOKn25jn8="; + hash = "sha256-neozpNSTxC4lkCuUpKPAeqGtQGgxf05WZZQOMTIkj2E="; }; nativeBuildInputs = [ From 5a44a67c873775af1a37ad1edf3d9e9397e65568 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 20 Sep 2024 21:38:09 +0800 Subject: [PATCH 55/93] boilr: fix build --- pkgs/by-name/bo/boilr/0001-update-time.patch | 287 +++++++++++++++++++ pkgs/by-name/bo/boilr/package.nix | 6 +- 2 files changed, 292 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/bo/boilr/0001-update-time.patch diff --git a/pkgs/by-name/bo/boilr/0001-update-time.patch b/pkgs/by-name/bo/boilr/0001-update-time.patch new file mode 100644 index 000000000000..334d0fe1e9b3 --- /dev/null +++ b/pkgs/by-name/bo/boilr/0001-update-time.patch @@ -0,0 +1,287 @@ +From 047681f1425c7cd68b77fdd729ea4664f73126b8 Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Mon, 23 Sep 2024 15:11:09 +0800 +Subject: [PATCH] update time + +--- + Cargo.lock | 87 +++++++++++++++++++++++++++++++++++------------------- + 1 file changed, 56 insertions(+), 31 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index be4fbeb..42f29b8 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -265,7 +265,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -282,7 +282,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -467,7 +467,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -809,6 +809,15 @@ dependencies = [ + "serde", + ] + ++[[package]] ++name = "deranged" ++version = "0.3.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", ++] ++ + [[package]] + name = "derivative" + version = "2.2.0" +@@ -1007,7 +1016,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -1259,7 +1268,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2002,6 +2011,12 @@ dependencies = [ + "winapi", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-integer" + version = "0.1.45" +@@ -2156,7 +2171,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2308,7 +2323,7 @@ dependencies = [ + "pest_meta", + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2339,7 +2354,7 @@ checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2389,6 +2404,12 @@ dependencies = [ + "windows-sys 0.48.0", + ] + ++[[package]] ++name = "powerfmt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" ++ + [[package]] + name = "ppv-lite86" + version = "0.2.17" +@@ -2407,9 +2428,9 @@ dependencies = [ + + [[package]] + name = "proc-macro2" +-version = "1.0.57" ++version = "1.0.86" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c4ec6d5fe0b140acb27c9a0444118cf55bfbb4e0b259739429abb4521dd67c16" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" + dependencies = [ + "unicode-ident", + ] +@@ -2425,9 +2446,9 @@ dependencies = [ + + [[package]] + name = "quote" +-version = "1.0.27" ++version = "1.0.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" + dependencies = [ + "proc-macro2", + ] +@@ -2711,22 +2732,22 @@ dependencies = [ + + [[package]] + name = "serde" +-version = "1.0.163" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" ++checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.163" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" ++checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2748,7 +2769,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2981,9 +3002,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "2.0.16" ++version = "2.0.77" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" ++checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" + dependencies = [ + "proc-macro2", + "quote", +@@ -3035,7 +3056,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -3061,11 +3082,14 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.21" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ ++ "deranged", + "itoa", ++ "num-conv", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -3073,16 +3097,17 @@ dependencies = [ + + [[package]] + name = "time-core" +-version = "0.1.1" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" ++checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.9" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +@@ -3153,7 +3178,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -3260,7 +3285,7 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + ] + + [[package]] +@@ -3443,7 +3468,7 @@ dependencies = [ + "once_cell", + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + "wasm-bindgen-shared", + ] + +@@ -3477,7 +3502,7 @@ checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" + dependencies = [ + "proc-macro2", + "quote", +- "syn 2.0.16", ++ "syn 2.0.77", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] +-- +2.46.0 + diff --git a/pkgs/by-name/bo/boilr/package.nix b/pkgs/by-name/bo/boilr/package.nix index 0cf3ff119dd3..83a83011c1c9 100644 --- a/pkgs/by-name/bo/boilr/package.nix +++ b/pkgs/by-name/bo/boilr/package.nix @@ -43,7 +43,11 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { hash = "sha256-bwCTsoZ/9TeO3wyEcOqxKePnj9glsDXWUBCLd3nVT80="; }; - cargoHash = "sha256-nAZU1xVpeRXubotla4I6InGMH4lisPMOnoqaK5mBPCM="; + cargoPatches = [ + ./0001-update-time.patch + ]; + + cargoHash = "sha256-09vPP+kNrmk0nN3Bdn9T7QjvuZvJeqQ56lCQIFb+Zrs="; nativeBuildInputs = [ perl ]; From d533a821bccde13307dadb97e2987a2447669b6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 07:18:32 +0000 Subject: [PATCH 56/93] gpxsee: 13.24 -> 13.26 --- pkgs/applications/misc/gpxsee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 62936d950521..fb53f2417c9c 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.24"; + version = "13.26"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-qdfNW29SvY0dQy4rS4IDVuYL3h6BByluCecsNSgHbn8="; + hash = "sha256-EIeUcSHJXpd1/90fAPrP9F/DVyZhkcZk8MJd9VO1D70="; }; buildInputs = [ From de112a504fd76ce0783ef4da54efb92a0970f57b Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Fri, 20 Sep 2024 22:20:05 +0200 Subject: [PATCH 57/93] python3Packages.morecantile: 5.3.0 -> 5.4.2 --- pkgs/development/python-modules/morecantile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/morecantile/default.nix b/pkgs/development/python-modules/morecantile/default.nix index 00a6a7c533b4..6ee40aedb2b5 100644 --- a/pkgs/development/python-modules/morecantile/default.nix +++ b/pkgs/development/python-modules/morecantile/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "morecantile"; - version = "5.3.0"; + version = "5.4.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "developmentseed"; repo = "morecantile"; rev = version; - hash = "sha256-F7xYQrOngoRsZjmS6ZHRGN0/GD53AYcMQzyY1LZ1O7I="; + hash = "sha256-kUAde+6IUu95tFHFCB6kWoYsRf9GxR+gRJki/tvhIaY="; }; nativeBuildInputs = [ flit ]; From 55c480745bb93b67792eeeb5669935e15c6999f3 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Sun, 22 Sep 2024 17:23:18 +0200 Subject: [PATCH 58/93] python3Packages.morecantile: disable one failing test for darwin --- pkgs/development/python-modules/morecantile/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/morecantile/default.nix b/pkgs/development/python-modules/morecantile/default.nix index 6ee40aedb2b5..0a8a5001c003 100644 --- a/pkgs/development/python-modules/morecantile/default.nix +++ b/pkgs/development/python-modules/morecantile/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, pytestCheckHook, @@ -42,6 +43,11 @@ buildPythonPackage rec { rasterio ]; + disabledTests = lib.optionals stdenv.isDarwin [ + # https://github.com/developmentseed/morecantile/issues/156 + "test_tiles_when_tms_bounds_and_provided_bounds_cross_antimeridian" + ]; + pythonImportsCheck = [ "morecantile" ]; meta = { From 5ca6aa4004d944387e7580060342d4954e1bfddf Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 18 Sep 2024 08:58:33 +0200 Subject: [PATCH 59/93] python312Packages.numpyro: switch to fetchFromGitHub --- .../python-modules/numpyro/default.nix | 63 ++++++++++++++++--- 1 file changed, 53 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/numpyro/default.nix b/pkgs/development/python-modules/numpyro/default.nix index 945a33ef0053..1df3800c4482 100644 --- a/pkgs/development/python-modules/numpyro/default.nix +++ b/pkgs/development/python-modules/numpyro/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, # build-system setuptools, @@ -13,11 +13,19 @@ numpy, tqdm, - # checks + # tests + # Our current version of tensorflow (2.13.0) is too old and doesn't support python>=3.12 + # We remove optional test dependencies that require tensorflow and skip the corresponding tests to + # avoid introducing a useless incompatibility with python 3.12: + # dm-haiku, + # flax, + # tensorflow-probability, funsor, + graphviz, + optax, + pyro-api, pytestCheckHook, -# TODO: uncomment when tensorflow-probability gets fixed. -# , tensorflow-probability + scikit-learn, }: buildPythonPackage rec { @@ -25,9 +33,11 @@ buildPythonPackage rec { version = "0.15.3"; pyproject = true; - src = fetchPypi { - inherit version pname; - hash = "sha256-9EXurmIA+IPXkNZc4p/yRfepY5usMyLZk+zPkcRAI7M="; + src = fetchFromGitHub { + owner = "pyro-ppl"; + repo = "numpyro"; + rev = "refs/tags/${version}"; + hash = "sha256-g+ep221hhLbCjQasKpiEAXkygI5A3Hglqo1tV8lv5eg="; }; build-system = [ setuptools ]; @@ -41,9 +51,14 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + # dm-haiku + # flax funsor + graphviz + optax + pyro-api pytestCheckHook - # TODO: uncomment when tensorflow-probability gets fixed. + scikit-learn # tensorflow-probability ]; @@ -60,17 +75,45 @@ buildPythonPackage rec { "test_kl_dirichlet_dirichlet" "test_kl_univariate" "test_mean_var" + # Tests want to download data "data_load" "test_jsb_chorales" + # RuntimeWarning: overflow encountered in cast "test_zero_inflated_logits_probs_agree" + # NameError: unbound axis name: _provenance "test_model_transformation" + + # require dm-haiku + "test_flax_state_dropout_smoke" + "test_flax_module" + "test_random_module_mcmc" + + # require flax + "test_haiku_state_dropout_smoke" + "test_haiku_module" + "test_random_module_mcmc" + + # require tensorflow-probability + "test_modified_bessel_first_kind_vect" + "test_diag_spectral_density_periodic" + "test_kernel_approx_periodic" + "test_modified_bessel_first_kind_one_dim" + "test_modified_bessel_first_kind_vect" + "test_periodic_gp_one_dim_model" + "test_no_tracer_leak_at_lazy_property_sample" ]; - # TODO: remove when tensorflow-probability gets fixed. - disabledTestPaths = [ "test/test_distributions.py" ]; + disabledTestPaths = [ + # require jaxns (unpackaged) + "test/contrib/test_nested_sampling.py" + + # requires tensorflow-probability + "test/contrib/test_tfp.py" + "test/test_distributions.py" + ]; meta = { description = "Library for probabilistic programming with NumPy"; From 33278de087b75243bd6e7480bcd622a2c5279201 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 21 Sep 2024 18:34:51 +0200 Subject: [PATCH 60/93] python312Packages.numpyro: disable failing test on darwin --- pkgs/development/python-modules/numpyro/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/numpyro/default.nix b/pkgs/development/python-modules/numpyro/default.nix index 1df3800c4482..a1aed20a5268 100644 --- a/pkgs/development/python-modules/numpyro/default.nix +++ b/pkgs/development/python-modules/numpyro/default.nix @@ -104,6 +104,11 @@ buildPythonPackage rec { "test_modified_bessel_first_kind_vect" "test_periodic_gp_one_dim_model" "test_no_tracer_leak_at_lazy_property_sample" + + # flaky on darwin + # TODO: uncomment at next release (0.15.4) as it has been fixed: + # https://github.com/pyro-ppl/numpyro/pull/1863 + "test_change_point_x64" ]; disabledTestPaths = [ From 02b5f869e28b7f179f2fcecc12b1896ab978f090 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 07:59:45 +0000 Subject: [PATCH 61/93] cargo-show-asm: 0.2.38 -> 0.2.39 --- pkgs/development/tools/rust/cargo-show-asm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-show-asm/default.nix b/pkgs/development/tools/rust/cargo-show-asm/default.nix index f6d52a2c54c6..80af89869c14 100644 --- a/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-show-asm"; - version = "0.2.38"; + version = "0.2.39"; src = fetchCrate { inherit pname version; - hash = "sha256-CYnW6wv4aL/Qs6IwPaRi9w8/iNMo5to0J3z4zTdgHaE="; + hash = "sha256-fGUx2SOgs5IF7KTr36fHktykrFkxqLWp4CWVGOZ+MeM="; }; - cargoHash = "sha256-jRsxP4b1URTDcnp8VsZvSTaPNOBBwq570eCn2jfQSGg="; + cargoHash = "sha256-iCHf4/bqICZ0bTeFFeVopU0Yl8VbxRd+Cr4WucuptVk="; nativeBuildInputs = [ installShellFiles From 76d0095d769058f4c4f5ff422013ba856a21ac18 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Mon, 23 Sep 2024 10:09:07 +0200 Subject: [PATCH 62/93] vscode-extensions.apollographql.vscode-apollo: 2.2.0 -> 2.3.2 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 7de68ddcbdfe..aaabe8bec4e6 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -313,8 +313,8 @@ let mktplcRef = { name = "vscode-apollo"; publisher = "apollographql"; - version = "2.2.0"; - hash = "sha256-9CKm9SLotPlwkAELb7Us/blK959HVt6eXiDp0fgVLmA="; + version = "2.3.2"; + hash = "sha256-5PAmyy4RX2hLgviWxgnxGZjgeFWZaJKNiYGNdCTL0IE="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/apollographql.vscode-apollo/changelog"; From c52ee7dcd06117cfc8f8e964fdc31ad30a0bd2bc Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Mon, 23 Sep 2024 10:13:16 +0200 Subject: [PATCH 63/93] vscode-extensions.davidanson.vscode-markdownlint: 0.55.0 -> 0.56.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 7de68ddcbdfe..287c33024f83 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1234,8 +1234,8 @@ let mktplcRef = { name = "vscode-markdownlint"; publisher = "DavidAnson"; - version = "0.55.0"; - hash = "sha256-slfHfRPcuRu+649n6kAr2bv9H6J+DvYVN/ysq1QpPQM="; + version = "0.56.0"; + hash = "sha256-ITSpPe032XcGIlfRQtJSR0iNTizs85qwfRaTtKwNn50="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog"; From 97c17485d96fbb391f693f9d0029ca33f35c19c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 09:41:12 +0000 Subject: [PATCH 64/93] flexget: 3.11.45 -> 3.11.46 --- pkgs/by-name/fl/flexget/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix index 3080bd4237e9..343fef81b385 100644 --- a/pkgs/by-name/fl/flexget/package.nix +++ b/pkgs/by-name/fl/flexget/package.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.11.45"; + version = "3.11.46"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-QtxtkXKBYf46cS+TAxJGQNQktHpLgGDIf7Czfznzr1s="; + hash = "sha256-zaysfvfsuA4XTj46vN1FHggqEaL8rfHL0UJVILhrwjg="; }; # relax dep constrains, keep environment constraints From 40084740564879baf7b65db5297074a91769fc08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 09:58:22 +0000 Subject: [PATCH 65/93] thunderbird-unwrapped: 128.1.1esr -> 128.2.3esr --- .../networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 6b13616ee1a5..e3a370c35259 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -60,8 +60,8 @@ in rec { }; thunderbird-128 = common { - version = "128.1.1esr"; - sha512 = "91e17d63383b05a7565838c61eda3b642f1bb3b4c43ae78a8810dd6d9ba2e5f10939be17598dd5e87bdf28d6f70ff9e154e54218aaf161bd89a5a6d30b504427"; + version = "128.2.3esr"; + sha512 = "f852d1fe6b8d41aa2f0fbc0fceae93cccf1e5f88d9c0447f504de775283289b82b246b79a01e8eb26e9c87197fb33138fb18c75ecc3f5f1bcfefa3920a7c7512"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-128"; From d03e2a74e3c68c31aa4b5fba31455aedf9f6c0fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 10:04:07 +0000 Subject: [PATCH 66/93] backdown: 1.1.1 -> 1.1.2 --- pkgs/tools/misc/backdown/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/backdown/default.nix b/pkgs/tools/misc/backdown/default.nix index f75388ea8677..78ad5be3f31e 100644 --- a/pkgs/tools/misc/backdown/default.nix +++ b/pkgs/tools/misc/backdown/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "backdown"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "Canop"; repo = "backdown"; rev = "v${version}"; - hash = "sha256-w9EdDSGqmHRLXwx5qFo0BngKATKtQsieMt6dPgfOrQ0="; + hash = "sha256-3+XmMRZz3SHF1sL+/CUvu4uQ2scE4ACpcC0r4nWhdkM="; }; - cargoHash = "sha256-BOwhXq/xVuk3KylL3KeIkiIG3SXVASFiYkUgKJhMzuU="; + cargoHash = "sha256-+SxXOpSBuVVdX2HmJ4vF45uf5bvRtPdwaXUb9kq+lK0="; meta = with lib; { description = "File deduplicator"; From 6e4d0242b0e79797bfaacd79d962bdb36ef3194f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 10:04:20 +0000 Subject: [PATCH 67/93] mdbook-mermaid: 0.13.0 -> 0.14.0 --- pkgs/tools/text/mdbook-mermaid/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-mermaid/default.nix b/pkgs/tools/text/mdbook-mermaid/default.nix index 52211b273710..0f2137a3976a 100644 --- a/pkgs/tools/text/mdbook-mermaid/default.nix +++ b/pkgs/tools/text/mdbook-mermaid/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-mermaid"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "badboy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Qyt5N6Fito++5lpjDXlzupmguue9kc409IpaDkIRgxw="; + hash = "sha256-elDKxtGMLka9Ss5CNnzw32ndxTUliNUgPXp7e4KUmBo="; }; - cargoHash = "sha256-ji38ZNOZ+SDL7+9dvaRIA38EsqMqYWpSmZntexJqcMU="; + cargoHash = "sha256-BnbllOsidqDEfKs0pd6AzFjzo51PKm9uFSwmOGTW3ug="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices From c65e2f7d280cd3ba934bb899a4869f31d7426fa6 Mon Sep 17 00:00:00 2001 From: L-Trump Date: Fri, 6 Sep 2024 03:49:32 +0800 Subject: [PATCH 68/93] easytier: init at 1.2.3 --- pkgs/by-name/ea/easytier/package.nix | 51 ++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 pkgs/by-name/ea/easytier/package.nix diff --git a/pkgs/by-name/ea/easytier/package.nix b/pkgs/by-name/ea/easytier/package.nix new file mode 100644 index 000000000000..9928fd07b0db --- /dev/null +++ b/pkgs/by-name/ea/easytier/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + protobuf, + nix-update-script, + darwin, + withQuic ? false, # with QUIC protocol support +}: + +rustPlatform.buildRustPackage rec { + pname = "easytier"; + version = "1.2.3"; + + src = fetchFromGitHub { + owner = "EasyTier"; + repo = "EasyTier"; + rev = "refs/tags/v${version}"; + hash = "sha256-7T6xdJrVTgg7rSTC2PaVTsBTgi14qJzaR6M8tRUL8OQ="; + }; + + cargoHash = "sha256-9wAGUVYKz7+Q8y+dmay8pEZnv7PikzuAoas/h5T3sLE="; + + nativeBuildInputs = [ protobuf ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + buildNoDefaultFeatures = stdenv.isMips; + buildFeatures = lib.optional stdenv.isMips "mips" ++ lib.optional withQuic "quic"; + + doCheck = false; # tests failed due to heavy rely on network + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/EasyTier/EasyTier"; + changelog = "https://github.com/EasyTier/EasyTier/releases/tag/v${version}"; + description = "Simple, decentralized mesh VPN with WireGuard support"; + longDescription = '' + EasyTier is a simple, safe and decentralized VPN networking solution implemented + with the Rust language and Tokio framework. + ''; + mainProgram = "easytier-core"; + license = lib.licenses.asl20; + platforms = with lib.platforms; unix ++ windows; + maintainers = with lib.maintainers; [ ltrump ]; + }; +} From 87c0458c4aabb6ff1c18162be0e16f5c42a2b3cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 10:52:20 +0000 Subject: [PATCH 69/93] python312Packages.xmlschema: 3.4.1 -> 3.4.2 --- pkgs/development/python-modules/xmlschema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 81bf772611f3..660f520c246b 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xmlschema"; - version = "3.4.1"; + version = "3.4.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; rev = "refs/tags/v${version}"; - hash = "sha256-ypyBBo00ZjYRvljn/eGaTxMViHzgoxq5IoNclWb7ghA="; + hash = "sha256-0x8nk8F+kg5SSDQI4dOnv67ilyN4z2MZ5phPC3PW4WQ="; }; build-system = [ setuptools ]; From 4513ea8cb0dd96b4d1b79f01963a5f76c8da51d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 10:54:26 +0000 Subject: [PATCH 70/93] ignite-cli: 28.5.2 -> 28.5.3 --- pkgs/by-name/ig/ignite-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ig/ignite-cli/package.nix b/pkgs/by-name/ig/ignite-cli/package.nix index f4595e0b048e..0db9b0a99b6f 100644 --- a/pkgs/by-name/ig/ignite-cli/package.nix +++ b/pkgs/by-name/ig/ignite-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "ignite-cli"; - version = "28.5.2"; + version = "28.5.3"; src = fetchFromGitHub { repo = "cli"; owner = "ignite"; rev = "v${version}"; - hash = "sha256-RaK8NooOYYuk8RhxeeU9mB9PNSgWJ9nOxxcpi87YQQ0="; + hash = "sha256-ziuzSV7LjRgR1wNE1QD+OszIeXiip7pPU4/BD8fhV5s="; }; - vendorHash = "sha256-u/EwT43K7Tu7ns0NIWkRl7OiQuP37zz4ERUwCLXY1TE="; + vendorHash = "sha256-5Z5AuZtPwfENKp8wMYfRqmnkX4W4fWTjWulT5uNusPo="; nativeBuildInputs = [ makeWrapper ]; From 93d8ee1b678d696130c55b6763514aa7c30b35c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 11:28:35 +0000 Subject: [PATCH 71/93] credhub-cli: 2.9.37 -> 2.9.38 --- pkgs/tools/admin/credhub-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/tools/admin/credhub-cli/default.nix index 57164bd0dca6..b47be23c03ae 100644 --- a/pkgs/tools/admin/credhub-cli/default.nix +++ b/pkgs/tools/admin/credhub-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "credhub-cli"; - version = "2.9.37"; + version = "2.9.38"; src = fetchFromGitHub { owner = "cloudfoundry-incubator"; repo = "credhub-cli"; rev = version; - sha256 = "sha256-BW6QMxBuiBmCE7ujpPc2sGEz0jkhEo0cPoa184Yx6/Q="; + sha256 = "sha256-xSjT+h85/ZknwTTLUhC9GWrCRN9VHMQBM6WuHX3ldq4="; }; # these tests require network access that we're not going to give them From 13935f9ffd328a6399de738ef7ad2d044ef68cec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 11:34:00 +0000 Subject: [PATCH 72/93] moar: 1.27.0 -> 1.27.2 --- pkgs/tools/misc/moar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index b42a2eea71de..ee5505215f20 100644 --- a/pkgs/tools/misc/moar/default.nix +++ b/pkgs/tools/misc/moar/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "moar"; - version = "1.27.0"; + version = "1.27.2"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-nuBLO+7AUa2e9WC95kami77si+LrhigGu1ngAoFwjqY="; + hash = "sha256-ZWAQrf4Y/Qse02T5Yt7byGXZheH1y7RvBsPP2xiF5Kw="; }; - vendorHash = "sha256-1u/2OlMX2FuZaxWnpU4n5r/4xKe+rK++GoCJiSq/BdE="; + vendorHash = "sha256-Orgh0X/HPfaKvliUvTllhk72LkQ/O3Eh9N/38Cj4Rew="; nativeBuildInputs = [ installShellFiles ]; From 0699fe6957b4e74b6f5dd98e709efc4db0ad2c94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 11:34:02 +0000 Subject: [PATCH 73/93] pokeget-rs: 1.6.2 -> 1.6.3 --- pkgs/tools/misc/pokeget-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/pokeget-rs/default.nix b/pkgs/tools/misc/pokeget-rs/default.nix index 42e00b9e6117..08f84c9a78c9 100644 --- a/pkgs/tools/misc/pokeget-rs/default.nix +++ b/pkgs/tools/misc/pokeget-rs/default.nix @@ -5,17 +5,17 @@ rustPlatform.buildRustPackage rec { pname = "pokeget-rs"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "talwat"; repo = "pokeget-rs"; rev = version; - hash = "sha256-Epet0CG4p7ruKHYVx0rX7KeOAe9kCer6Y8bguOY9SUs="; + hash = "sha256-0dss+ZJ1hhQGpWySWhyF+T1T+G3BlnKfSosgCJa8MPE="; fetchSubmodules = true; }; - cargoHash = "sha256-gakrHutB6KBYcSZce/MDDnHK6VRPHU2B2xwtmUi4ZWY="; + cargoHash = "sha256-VYF2uhgxUFH/VAy/ttQOULRFFiPRf0D+0WfGlQyYDGc="; meta = with lib; { description = "Better rust version of pokeget"; From 52779a7b780c562d2c4483d5220de0398a593009 Mon Sep 17 00:00:00 2001 From: Savyasachee Jha Date: Sat, 14 Sep 2024 11:14:32 +0530 Subject: [PATCH 74/93] firefly-iii-data-importer: 1.5.5 -> 1.5.6 --- pkgs/by-name/fi/firefly-iii-data-importer/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix index a4614f5ae27b..106069c1e7ff 100644 --- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix +++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix @@ -13,13 +13,13 @@ let pname = "firefly-iii-data-importer"; - version = "1.5.5"; + version = "1.5.6"; src = fetchFromGitHub { owner = "firefly-iii"; repo = "data-importer"; rev = "v${version}"; - hash = "sha256-nAeLXxUwaw/wHYh3NywI4/mFi82i/2b3McFfCFGAIjE="; + hash = "sha256-IIlcOGulcBJsYz7Yx3YWV/c6yvb8+82AvFghQ05dUcI="; }; in @@ -42,12 +42,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-yLu/FMKn/uUy5g6td3mfPAb9ptjJne4vd478fjaS9U0="; + vendorHash = "sha256-j1rCcHt5E1aFwgnOKZZccaGPs5JfpBtN05edeSvId94="; npmDeps = fetchNpmDeps { inherit src; name = "${pname}-npm-deps"; - hash = "sha256-35mS+0Ea69CAwV9liTU3lcKp3ww3qLbTRWlF0AQNx5w="; + hash = "sha256-mdBQubfV5Bgk9NxsWokTS6zA4r3gggWVSwhrfKPUi5s="; }; composerRepository = php83.mkComposerRepository { From 28306a729a1e99e7f5c41772a371e865917297e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 04:02:59 +0000 Subject: [PATCH 75/93] snipe-it: 7.0.11 -> 7.0.12 --- pkgs/by-name/sn/snipe-it/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sn/snipe-it/package.nix b/pkgs/by-name/sn/snipe-it/package.nix index 5f2606a951fa..da38ec7f5887 100644 --- a/pkgs/by-name/sn/snipe-it/package.nix +++ b/pkgs/by-name/sn/snipe-it/package.nix @@ -8,13 +8,13 @@ php.buildComposerProject (finalAttrs: { pname = "snipe-it"; - version = "7.0.11"; + version = "7.0.12"; src = fetchFromGitHub { owner = "snipe"; repo = "snipe-it"; rev = "v${finalAttrs.version}"; - hash = "sha256-XMsLK6IKbnlYZk7tPYq++prv+28FefEbahOqmeEAAiY="; + hash = "sha256-CTOhnGDmvxcQrS7VPsMeap6aD9YajSZ/C25RcRbL65w="; }; vendorHash = "sha256-8YZD6Q1Mb5VUGL/KQnYTtXKL3aziPfAmwvVthDdyBYY="; From 9601fce1d14317e3767453c3296516f95e67900f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 12:14:28 +0000 Subject: [PATCH 76/93] python312Packages.asteval: 1.0.3 -> 1.0.4 --- pkgs/development/python-modules/asteval/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix index 090188b5cbc9..43872ff90ed3 100644 --- a/pkgs/development/python-modules/asteval/default.nix +++ b/pkgs/development/python-modules/asteval/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asteval"; - version = "1.0.3"; + version = "1.0.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "lmfit"; repo = "asteval"; rev = "refs/tags/${version}"; - hash = "sha256-CAjj5vlXCfelH7nyE/tS44ThCQrCwrNETyjXEVbfmiA="; + hash = "sha256-rq8qZqTtnKyVclX5R+yRouLz1FySRgc7DMN9W9UBkyI="; }; postPatch = '' From 31ce1ce97f73495185c5cdeca6dcf1a4e3c7d725 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 12:14:36 +0000 Subject: [PATCH 77/93] docker-compose: 2.29.3 -> 2.29.7 --- pkgs/applications/virtualization/docker/compose.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index e72797bea8e0..45099329c2e6 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.29.3"; + version = "2.29.7"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - hash = "sha256-t9NyBW9wUwwMB2VAqRUn8KosQFuqWFwuG4Z6KmHXmXc="; + hash = "sha256-6ksZAGVAFnLwPnCXlCtp4cWfxzJRp/bfVkpvp3Z6fiQ="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-hhqNKueE5mJzGbhHqu/Cg9uQJ4v6I8q7+h4MB0MsJww="; + vendorHash = "sha256-B2ywdZjp7h7eFYNJ4wXmAdbOxc8ftGqHnLmDvzQASJE="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; From 28b2fdd261e8071e24f90e21361f8ba508ef3617 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 12:14:49 +0000 Subject: [PATCH 78/93] mountpoint-s3: 1.9.0 -> 1.9.1 --- pkgs/by-name/mo/mountpoint-s3/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/mountpoint-s3/package.nix b/pkgs/by-name/mo/mountpoint-s3/package.nix index 2a80e949de43..68533127f9ba 100644 --- a/pkgs/by-name/mo/mountpoint-s3/package.nix +++ b/pkgs/by-name/mo/mountpoint-s3/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "mountpoint-s3"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "awslabs"; repo = "mountpoint-s3"; rev = "v${version}"; - hash = "sha256-uzTnkspTS3WvJUOmp8z7L/L1ut6NvnSlnsRa5yvaTRI="; + hash = "sha256-8t/gAz08jFRuF0q3bo4y8tiIq4iYgAkXf5udYNIccu0="; fetchSubmodules = true; }; - cargoHash = "sha256-kru8CBN9Mqm8Og7SKICjqSvds7z58RRqI4W2txLvWXo="; + cargoHash = "sha256-Fz7LfAn78JVip0QshoL5KMAEHMtG8bkLzz4v95/qt3E="; # thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9: # cargo metadata failure: error: none of the selected packages contains these features: libfuse3 From f533b790e7d3110258c39d113ee2b17193d8a4fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 12:15:16 +0000 Subject: [PATCH 79/93] gqlgenc: 0.25.0 -> 0.25.1 --- pkgs/development/tools/gqlgenc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gqlgenc/default.nix b/pkgs/development/tools/gqlgenc/default.nix index 34a279ec108a..3b08fda8ad9d 100644 --- a/pkgs/development/tools/gqlgenc/default.nix +++ b/pkgs/development/tools/gqlgenc/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "gqlgenc"; - version = "0.25.0"; + version = "0.25.1"; src = fetchFromGitHub { owner = "yamashou"; repo = "gqlgenc"; rev = "v${version}"; - sha256 = "sha256-4d2IFJIoIX0IlS/v/EJkn1cK8hJl9808PE8ZnwqYzu8="; + sha256 = "sha256-i2+J8hWbADeOmua4I3/NX8MC6FKP+5I9BqwCDkLOnvw="; }; excludedPackages = [ "example" ]; - vendorHash = "sha256-GcqLW/Ooy2h5spYA94/HmaG0yYiqA4g5DyKlg9EORCQ="; + vendorHash = "sha256-/lrOc2suNyNRlpi22QUr6MZCIrdWaWiZUv6pe/mYnB8="; meta = with lib; { description = "Go tool for building GraphQL client with gqlgen"; From 0fb7a292e3567887410a5968b5ab2cc8ecaf9524 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 04:26:25 +0000 Subject: [PATCH 80/93] minio: 2024-09-09T16-59-28Z -> 2024-09-13T20-26-02Z --- pkgs/servers/minio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 09918625b1c1..15351840a2b1 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -21,16 +21,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2024-09-09T16-59-28Z"; + version = "2024-09-13T20-26-02Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - hash = "sha256-mFt1oo48GC9mVnGXSWc3SgtgQZlu1L9zAfM7nBYd9jE="; + hash = "sha256-ldPPnN63OZdnsQjeiKT32VVFkaRyvJ10M5EsVCBoz8I="; }; - vendorHash = "sha256-otRSkxMoshDHLwUn/VA+svvb/fJhkBqZth1lfOUBytY="; + vendorHash = "sha256-nK3t3wwV6vhU7SHYfhV/LDs5S9N5yTXjB2cbB0rwk+I="; doCheck = false; From ce8ecb30b13ff3d68e56ab683f37ff611388b3f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 13:10:26 +0000 Subject: [PATCH 81/93] crowdin-cli: 4.1.2 -> 4.2.0 --- pkgs/tools/text/crowdin-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix index 1a1b70c9513e..5c46c1efef09 100644 --- a/pkgs/tools/text/crowdin-cli/default.nix +++ b/pkgs/tools/text/crowdin-cli/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "crowdin-cli"; - version = "4.1.2"; + version = "4.2.0"; src = fetchurl { url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; - hash = "sha256-D0wx570pU1FuyoQ62ZPN1v9jC9tRrJuuQet8D8w2v+M="; + hash = "sha256-158zbgYw4FP/vQVsSs9tt9VcisBWpRn/D4ORiM24PYY="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; From 0cbe501a06afe2711c5eda812aa69fefe6113200 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Sep 2024 23:36:34 +1000 Subject: [PATCH 82/93] grafana-loki: 3.1.1 -> 3.2.0 (#343173) https://github.com/grafana/loki/releases/tag/v3.2.0 --- pkgs/servers/monitoring/loki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 00924d94c5ae..aa70eda0de81 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -10,14 +10,14 @@ }: buildGoModule rec { - version = "3.1.1"; + version = "3.2.0"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${version}"; - hash = "sha256-QOokLht/nIzQAzXQuJv5M4QTQD0Zhzf9+Q0ILl2Mds0="; + hash = "sha256-dche8MbVSlwKMD/znOCj80FNf5KZmEuI3uodrFLrmjM="; }; vendorHash = null; From b760aff9740377ddd88218ccb9ee80fab76c59e5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Sep 2024 23:37:29 +1000 Subject: [PATCH 83/93] rke2_testing: 1.31.0-rc1+rke2r1 -> 1.31.1-rc3+rke2r1 (#343540) --- .../cluster/rke2/testing/versions.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/cluster/rke2/testing/versions.nix b/pkgs/applications/networking/cluster/rke2/testing/versions.nix index 1801831584d1..5cf0039d5abd 100644 --- a/pkgs/applications/networking/cluster/rke2/testing/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/testing/versions.nix @@ -1,14 +1,14 @@ { - rke2Version = "1.31.0-rc1+rke2r1"; - rke2RepoSha256 = "0mfl01rv6xn2kg2739215j9hsyym16mgp92bqsz0hkpfm61dd96j"; - rke2Commit = "3acd10e9389fa930860896ca6ed925a15dff61a3"; - rke2VendorHash = "sha256-/ALzC2fYYI+DbF+2TSNBiMy57T8wfXGPpdyKtbqdrtE="; - k8sVersion = "v1.31.0"; - k8sImageTag = "v1.31.0-rke2r1-build20240815"; + rke2Version = "1.31.1-rc3+rke2r1"; + rke2RepoSha256 = "1j09f95d99xk1jbsy08cl1rw5y1ljnrmq3nv1rixlc4hgqwz56pm"; + rke2Commit = "909d20d6a28cd7656b7177190f06f69f57927613"; + rke2VendorHash = "sha256-7nWbWi4oJTOWZ5iZr9ptECDJJakPg4qZ7hW+tU7LBsI="; + k8sVersion = "v1.31.1"; + k8sImageTag = "v1.31.1-rke2r1-build20240912"; etcdVersion = "v3.5.13-k3s1"; pauseVersion = "3.6"; - ccmVersion = "v1.29.3-build20240515"; - dockerizedVersion = "v1.31.0-dev."; - golangVersion = "go1.22.5"; + ccmVersion = "v1.31.0-build20240910"; + dockerizedVersion = "v1.31.1-dev."; + golangVersion = "go1.22.6"; eol = "2025-10-28"; } From 201d35822e8ab85191ffc9d2c9097ae14d0fd50e Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Mon, 23 Sep 2024 15:40:56 +0200 Subject: [PATCH 84/93] nixos/nar-serve: remove `with lib;` (#343472) --- nixos/modules/services/networking/nar-serve.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/nar-serve.nix b/nixos/modules/services/networking/nar-serve.nix index 5a5cefe86d29..ea5be25a4d26 100644 --- a/nixos/modules/services/networking/nar-serve.nix +++ b/nixos/modules/services/networking/nar-serve.nix @@ -1,18 +1,18 @@ { config, pkgs, lib, ... }: -with lib; let + inherit (lib) mkOption types; cfg = config.services.nar-serve; in { meta = { - maintainers = [ maintainers.rizary maintainers.zimbatm ]; + maintainers = with lib.maintainers; [ rizary zimbatm ]; }; options = { services.nar-serve = { - enable = mkEnableOption "serving NAR file contents via HTTP"; + enable = lib.mkEnableOption "serving NAR file contents via HTTP"; - package = mkPackageOption pkgs "nar-serve" { }; + package = lib.mkPackageOption pkgs "nar-serve" { }; port = mkOption { type = types.port; @@ -48,7 +48,7 @@ in }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.nar-serve = { description = "NAR server"; after = [ "network.target" ]; From 72e330b1c1a30ff9f2243d33fc4860736c20cc32 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 23 Sep 2024 15:58:33 +0200 Subject: [PATCH 85/93] python3Packages.ttfautohint-py: use correct description Was using ufomerge's description and not the one from ttfautohint-py --- pkgs/development/python-modules/ttfautohint-py/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ttfautohint-py/default.nix b/pkgs/development/python-modules/ttfautohint-py/default.nix index 60ded9cc82dd..98358555eed6 100644 --- a/pkgs/development/python-modules/ttfautohint-py/default.nix +++ b/pkgs/development/python-modules/ttfautohint-py/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "ttfautohint" ]; meta = { - description = "Command line utility and Python library that merges two UFO source format fonts into a single file"; + description = "Python wrapper for ttfautohint, a free auto-hinter for TrueType fonts"; homepage = "https://github.com/fonttools/ttfautohint-py"; changelog = "https://github.com/fonttools/ttfautohint-py/releases/tag/v${version}"; license = lib.licenses.mit; From f6d6fcd7dc2d5991be3fe9e77a198449dcb10387 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 23 Sep 2024 18:14:45 +0400 Subject: [PATCH 86/93] gpxsee: remove qt5compat from buildInputs --- pkgs/applications/misc/gpxsee/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index fb53f2417c9c..add7ea7a789c 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -9,7 +9,6 @@ , qtpositioning ? null # qt6 only , qtserialport , qtsvg -, qt5compat ? null # qt6 only , wrapQtAppsHook }: @@ -33,7 +32,6 @@ stdenv.mkDerivation (finalAttrs: { qtbase qtpositioning qtsvg - qt5compat ] else [ qtlocation ]); From 7cc2a13773f31cd2b5328e76d529c8986c7dba52 Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 23 Sep 2024 15:23:40 +0800 Subject: [PATCH 87/93] apostrophe: fix latex rendering by providing local mathjax --- pkgs/by-name/ap/apostrophe/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ap/apostrophe/package.nix b/pkgs/by-name/ap/apostrophe/package.nix index a7b9ee513331..3f39ac124453 100644 --- a/pkgs/by-name/ap/apostrophe/package.nix +++ b/pkgs/by-name/ap/apostrophe/package.nix @@ -5,6 +5,7 @@ libspelling, fetchFromGitHub, python3Packages, + nodePackages, meson, ninja, pkg-config, @@ -50,7 +51,7 @@ let hash = "sha256-a+J+GasFmRvu5cJ1GLXscoJ+owzFXsLhCbeDbYChkyQ="; }; in -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { inherit version src; pname = "apostrophe"; pyproject = false; @@ -62,6 +63,11 @@ python3Packages.buildPythonApplication rec { patchShebangs --build build-aux/meson_post_install.py '' + # Use mathjax from nixpkgs to avoid loading from CDN + + '' + substituteInPlace apostrophe/preview_converter.py \ + --replace-fail "--mathjax" "--mathjax=file://${nodePackages.mathjax}/lib/node_modules/mathjax/es5/tex-chtml-full.js" + '' # Should be done in postInstall, but meson checks this eagerly before build + '' install -d $out/share/apostrophe/libs From 1b32f1b57c4087b3794cc6bcf329e33c95aa2e9a Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 23 Sep 2024 11:40:03 -0300 Subject: [PATCH 88/93] dotnet: remove nuget-package-hook from runtime packages --- pkgs/development/compilers/dotnet/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/dotnet/common.nix b/pkgs/development/compilers/dotnet/common.nix index 491b8c0ff272..9fcd79c752d1 100644 --- a/pkgs/development/compilers/dotnet/common.nix +++ b/pkgs/development/compilers/dotnet/common.nix @@ -35,8 +35,8 @@ }); propagatedBuildInputs = - (args.propagatedBuildInputs or []) - ++ [ nugetPackageHook ]; + (args.propagatedBuildInputs or [ ]) + ++ lib.optional (type == "sdk") nugetPackageHook; nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ installShellFiles ]; From 9ebd4eebab7fceb5e702ba32ee072adb39c4f4c1 Mon Sep 17 00:00:00 2001 From: Ben Chand Date: Mon, 23 Sep 2024 17:02:05 +0200 Subject: [PATCH 89/93] maintainers: add benchand --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 81cba939f9bf..e45831300c00 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2514,6 +2514,12 @@ githubId = 6145260; keys = [ { fingerprint = "804B 6CB8 AED5 61D9 3DAD 4DC5 E2F2 2C5E DF20 119D"; } ]; }; + benchand = { + name = "Ben Chand"; + email = "BenChand1995@gmail.com"; + github = "BenChand"; + githubId = 3618457; + }; bendlas = { email = "herwig@bendlas.net"; matrix = "@bendlas:matrix.org"; From 1ab344b7e55ad3a5b3afcb563402ac4c516b6ea1 Mon Sep 17 00:00:00 2001 From: Ben Chand Date: Mon, 23 Sep 2024 17:02:25 +0200 Subject: [PATCH 90/93] imgpkg: init at 0.43.1 --- pkgs/by-name/im/imgpkg/package.nix | 32 ++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/im/imgpkg/package.nix diff --git a/pkgs/by-name/im/imgpkg/package.nix b/pkgs/by-name/im/imgpkg/package.nix new file mode 100644 index 000000000000..66b32695c212 --- /dev/null +++ b/pkgs/by-name/im/imgpkg/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "imgpkg"; + version = "0.43.1"; + + src = fetchFromGitHub { + owner = "carvel-dev"; + repo = "imgpkg"; + rev = "v${version}"; + hash = "sha256-RjTVJjuzjNTZrg1VZ4NrDf1SZmS+CGzofYTBQEZNIag="; + }; + + vendorHash = null; + + subPackages = [ "cmd/imgpkg" ]; + + CGO_ENABLED = "0"; + ldflags = [ "-X=carvel.dev/imgpkg/pkg/imgpkg/cmd.Version=${version}" ]; + + meta = { + description = "Store application configuration files in Docker/OCI registries"; + homepage = "https://carvel.dev/imgpkg"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ benchand ]; + mainProgram = "imgpkg"; + }; +} From 3db11314908c41fcb4734a948a2a340c9c92ee68 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 10:34:22 +0000 Subject: [PATCH 91/93] shattered-pixel-dungeon: 2.5.0 -> 2.5.2 --- pkgs/games/shattered-pixel-dungeon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index 0de47544df89..7b97a9af33f4 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -5,13 +5,13 @@ callPackage ./generic.nix rec { pname = "shattered-pixel-dungeon"; - version = "2.5.0"; + version = "2.5.2"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; rev = "v${version}"; - hash = "sha256-G/g84Jl+jkmvxmQtCIPHsW9vHi3FPKt7A087SkVxNVE="; + hash = "sha256-/CxOiJaBiOgKEKVSX7qx2HjMLUgeE+lRyRn4nrAqzsg="; }; depsPath = ./deps.json; From a0652e99b9bc6dc1a407760fd0f348d00b859972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20Ol=C3=A1h?= Date: Fri, 20 Sep 2024 17:21:56 +0200 Subject: [PATCH 92/93] bitbucket-cli: init at 1.0.0 --- pkgs/by-name/bi/bitbucket-cli/package.nix | 30 +++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/by-name/bi/bitbucket-cli/package.nix diff --git a/pkgs/by-name/bi/bitbucket-cli/package.nix b/pkgs/by-name/bi/bitbucket-cli/package.nix new file mode 100644 index 000000000000..f5927ec44de5 --- /dev/null +++ b/pkgs/by-name/bi/bitbucket-cli/package.nix @@ -0,0 +1,30 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "bitbucket-cli"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "swisscom"; + repo = "bitbucket-cli"; + rev = "v${version}"; + hash = "sha256-8Qvlv/S5IkRk+2D/Pnb0+FP7ryHh1kSRJCiUjSO0OtI="; + }; + + vendorHash = "sha256-xjCY3Ycz5Ty6jTDHNNUWYp2SP8EPhDiwO7+WJBL3lAQ="; + + # Tests seem to be using Swisscom's live servers. + doCheck = false; + + meta = { + description = "Bitbucket Enterprise CLI"; + homepage = "https://github.com/swisscom/bitbucket-cli"; + mainProgram = "bitbucket-cli"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ attila ]; + platforms = with lib.platforms; linux ++ darwin; + }; +} From 32cc04236834f5ba5c14b344f0106bea9cf65395 Mon Sep 17 00:00:00 2001 From: Simon Hauser Date: Mon, 23 Sep 2024 20:00:19 +0200 Subject: [PATCH 93/93] mariadb: 10.5.26, 10.6.19, 10.11.9, 11.4.3 (#334878) * mariadb: 10.5.26, 10.6.19, 10.11.9, 11.4.3 * nixos/tests/automysqlbackup: nixfmt * nixos/automysqlbackup: fix tests * nixos/tests/mariadb-galera: nixfmt * nixos/tests/mariadb-galera: fix test failing with new default IPv6 configuration --- .../services/backup/automysqlbackup.nix | 9 - nixos/tests/mysql/mariadb-galera.nix | 497 +++++++++--------- nixos/tests/mysql/mysql-autobackup.nix | 76 +-- pkgs/servers/sql/mariadb/default.nix | 22 +- .../0001-Fix-build-with-libxml2-2.12.patch | 167 ------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 7 files changed, 314 insertions(+), 460 deletions(-) delete mode 100644 pkgs/servers/sql/mariadb/patch/0001-Fix-build-with-libxml2-2.12.patch diff --git a/nixos/modules/services/backup/automysqlbackup.nix b/nixos/modules/services/backup/automysqlbackup.nix index cf3b6b8d13a4..d5efda74f26f 100644 --- a/nixos/modules/services/backup/automysqlbackup.nix +++ b/nixos/modules/services/backup/automysqlbackup.nix @@ -118,15 +118,6 @@ in name = user; ensurePermissions = { "*.*" = "SELECT, SHOW VIEW, TRIGGER, LOCK TABLES, EVENT"; - - # https://forums.mysql.com/read.php?10,668311,668315#msg-668315 - "function sys.extract_table_from_file_name" = "execute"; - "function sys.format_path" = "execute"; - "function sys.format_statement" = "execute"; - "function sys.extract_schema_from_file_name" = "execute"; - "function sys.ps_thread_account" = "execute"; - "function sys.format_time" = "execute"; - "function sys.format_bytes" = "execute"; }; }; diff --git a/nixos/tests/mysql/mariadb-galera.nix b/nixos/tests/mysql/mariadb-galera.nix index 7455abbce5fb..65705afbf82c 100644 --- a/nixos/tests/mysql/mariadb-galera.nix +++ b/nixos/tests/mysql/mariadb-galera.nix @@ -1,8 +1,8 @@ { system ? builtins.currentSystem, - config ? {}, + config ? { }, pkgs ? import ../../.. { inherit system config; }, - lib ? pkgs.lib + lib ? pkgs.lib, }: let @@ -11,240 +11,263 @@ let makeTest = import ./../make-test-python.nix; # Common user configuration - makeGaleraTest = { - mariadbPackage, - name ? mkTestName mariadbPackage, - galeraPackage ? pkgs.mariadb-galera - }: makeTest { - name = "${name}-galera-mariabackup"; - meta = { - maintainers = with lib.maintainers; [ izorkin ] ++ lib.teams.helsinki-systems.members; + makeGaleraTest = + { + mariadbPackage, + name ? mkTestName mariadbPackage, + galeraPackage ? pkgs.mariadb-galera, + }: + makeTest { + name = "${name}-galera-mariabackup"; + meta = { + maintainers = with lib.maintainers; [ izorkin ] ++ lib.teams.helsinki-systems.members; + }; + + # The test creates a Galera cluster with 3 nodes and is checking if mariabackup-based SST works. The cluster is tested by creating a DB and an empty table on one node, + # and checking the table's presence on the other node. + nodes = + let + mkGaleraNode = + { + id, + method, + }: + let + address = "192.168.1.${toString id}"; + isFirstClusterNode = id == 1 || id == 4; + in + { + users = { + users.testuser = { + isSystemUser = true; + group = "testusers"; + }; + groups.testusers = { }; + }; + + networking = { + interfaces.eth1 = { + ipv4.addresses = [ + { + inherit address; + prefixLength = 24; + } + ]; + ipv6.addresses = lib.mkForce [ ]; + }; + extraHosts = lib.concatMapStringsSep "\n" (i: "192.168.1.${toString i} galera_0${toString i}") ( + lib.range 1 6 + ); + firewall.allowedTCPPorts = [ + 3306 + 4444 + 4567 + 4568 + ]; + firewall.allowedUDPPorts = [ 4567 ]; + }; + systemd.services.mysql = with pkgs; { + path = with pkgs; [ + bash + gawk + gnutar + gzip + inetutils + iproute2 + netcat + procps + pv + rsync + socat + stunnel + which + ]; + }; + services.mysql = { + enable = true; + package = mariadbPackage; + ensureDatabases = lib.mkIf isFirstClusterNode [ "testdb" ]; + ensureUsers = lib.mkIf isFirstClusterNode [ + { + name = "testuser"; + ensurePermissions = { + "testdb.*" = "ALL PRIVILEGES"; + }; + } + ]; + initialScript = lib.mkIf isFirstClusterNode ( + pkgs.writeText "mariadb-init.sql" '' + GRANT ALL PRIVILEGES ON *.* TO 'check_repl'@'localhost' IDENTIFIED BY 'check_pass' WITH GRANT OPTION; + FLUSH PRIVILEGES; + '' + ); + settings = { + mysqld = { + bind_address = "0.0.0.0"; + }; + galera = { + wsrep_on = "ON"; + wsrep_debug = "NONE"; + wsrep_retry_autocommit = "3"; + wsrep_provider = "${galeraPackage}/lib/galera/libgalera_smm.so"; + wsrep_cluster_address = + "gcomm://" + + lib.optionalString (id == 2 || id == 3) "galera_01,galera_02,galera_03" + + lib.optionalString (id == 5 || id == 6) "galera_04,galera_05,galera_06"; + wsrep_cluster_name = "galera"; + wsrep_node_address = address; + wsrep_node_name = "galera_0${toString id}"; + wsrep_sst_method = method; + wsrep_sst_auth = "check_repl:check_pass"; + binlog_format = "ROW"; + enforce_storage_engine = "InnoDB"; + innodb_autoinc_lock_mode = "2"; + }; + }; + }; + }; + in + { + galera_01 = mkGaleraNode { + id = 1; + method = "mariabackup"; + }; + + galera_02 = mkGaleraNode { + id = 2; + method = "mariabackup"; + }; + + galera_03 = mkGaleraNode { + id = 3; + method = "mariabackup"; + }; + + galera_04 = mkGaleraNode { + id = 4; + method = "rsync"; + }; + + galera_05 = mkGaleraNode { + id = 5; + method = "rsync"; + }; + + galera_06 = mkGaleraNode { + id = 6; + method = "rsync"; + }; + + }; + + testScript = '' + galera_01.start() + galera_01.wait_for_unit("mysql") + galera_01.wait_for_open_port(3306) + galera_01.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db1 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_01.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db1 values (37);'" + ) + galera_02.start() + galera_02.wait_for_unit("mysql") + galera_02.wait_for_open_port(3306) + galera_03.start() + galera_03.wait_for_unit("mysql") + galera_03.wait_for_open_port(3306) + galera_02.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 37" + ) + galera_02.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db2 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_02.succeed("systemctl stop mysql") + galera_01.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db2 values (38);'" + ) + galera_03.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db3 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_01.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db3 values (39);'" + ) + galera_02.succeed("systemctl start mysql") + galera_02.wait_for_open_port(3306) + galera_02.succeed( + "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_cluster_size.*3'" + ) + galera_03.succeed( + "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_local_state_comment.*Synced'" + ) + galera_01.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db3;' -N | grep 39" + ) + galera_02.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db2;' -N | grep 38" + ) + galera_03.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 37" + ) + galera_01.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db3;'") + galera_02.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db2;'") + galera_03.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db1;'") + galera_01.crash() + galera_02.crash() + galera_03.crash() + + galera_04.start() + galera_04.wait_for_unit("mysql") + galera_04.wait_for_open_port(3306) + galera_04.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db1 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_04.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db1 values (41);'" + ) + galera_05.start() + galera_05.wait_for_unit("mysql") + galera_05.wait_for_open_port(3306) + galera_06.start() + galera_06.wait_for_unit("mysql") + galera_06.wait_for_open_port(3306) + galera_05.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 41" + ) + galera_05.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db2 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_05.succeed("systemctl stop mysql") + galera_04.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db2 values (42);'" + ) + galera_06.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db3 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_04.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db3 values (43);'" + ) + galera_05.succeed("systemctl start mysql") + galera_05.wait_for_open_port(3306) + galera_05.succeed( + "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_cluster_size.*3'" + ) + galera_06.succeed( + "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_local_state_comment.*Synced'" + ) + galera_04.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db3;' -N | grep 43" + ) + galera_05.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db2;' -N | grep 42" + ) + galera_06.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 41" + ) + galera_04.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db3;'") + galera_05.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db2;'") + galera_06.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db1;'") + ''; }; - - # The test creates a Galera cluster with 3 nodes and is checking if mariabackup-based SST works. The cluster is tested by creating a DB and an empty table on one node, - # and checking the table's presence on the other node. - nodes = let - mkGaleraNode = { - id, - method - }: let - address = "192.168.1.${toString id}"; - isFirstClusterNode = id == 1 || id == 4; - in { - users = { - users.testuser = { - isSystemUser = true; - group = "testusers"; - }; - groups.testusers = { }; - }; - - networking = { - interfaces.eth1 = { - ipv4.addresses = [ - { inherit address; prefixLength = 24; } - ]; - }; - extraHosts = lib.concatMapStringsSep "\n" (i: "192.168.1.${toString i} galera_0${toString i}") (lib.range 1 6); - firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; - firewall.allowedUDPPorts = [ 4567 ]; - }; - systemd.services.mysql = with pkgs; { - path = with pkgs; [ - bash - gawk - gnutar - gzip - inetutils - iproute2 - netcat - procps - pv - rsync - socat - stunnel - which - ]; - }; - services.mysql = { - enable = true; - package = mariadbPackage; - ensureDatabases = lib.mkIf isFirstClusterNode [ "testdb" ]; - ensureUsers = lib.mkIf isFirstClusterNode [{ - name = "testuser"; - ensurePermissions = { - "testdb.*" = "ALL PRIVILEGES"; - }; - }]; - initialScript = lib.mkIf isFirstClusterNode (pkgs.writeText "mariadb-init.sql" '' - GRANT ALL PRIVILEGES ON *.* TO 'check_repl'@'localhost' IDENTIFIED BY 'check_pass' WITH GRANT OPTION; - FLUSH PRIVILEGES; - ''); - settings = { - mysqld = { - bind_address = "0.0.0.0"; - }; - galera = { - wsrep_on = "ON"; - wsrep_debug = "NONE"; - wsrep_retry_autocommit = "3"; - wsrep_provider = "${galeraPackage}/lib/galera/libgalera_smm.so"; - wsrep_cluster_address = "gcomm://" - + lib.optionalString (id == 2 || id == 3) "galera_01,galera_02,galera_03" - + lib.optionalString (id == 5 || id == 6) "galera_04,galera_05,galera_06"; - wsrep_cluster_name = "galera"; - wsrep_node_address = address; - wsrep_node_name = "galera_0${toString id}"; - wsrep_sst_method = method; - wsrep_sst_auth = "check_repl:check_pass"; - binlog_format = "ROW"; - enforce_storage_engine = "InnoDB"; - innodb_autoinc_lock_mode = "2"; - }; - }; - }; - }; - in { - galera_01 = mkGaleraNode { - id = 1; - method = "mariabackup"; - }; - - galera_02 = mkGaleraNode { - id = 2; - method = "mariabackup"; - }; - - galera_03 = mkGaleraNode { - id = 3; - method = "mariabackup"; - }; - - galera_04 = mkGaleraNode { - id = 4; - method = "rsync"; - }; - - galera_05 = mkGaleraNode { - id = 5; - method = "rsync"; - }; - - galera_06 = mkGaleraNode { - id = 6; - method = "rsync"; - }; - - }; - - testScript = '' - galera_01.start() - galera_01.wait_for_unit("mysql") - galera_01.wait_for_open_port(3306) - galera_01.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; create table db1 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" - ) - galera_01.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db1 values (37);'" - ) - galera_02.start() - galera_02.wait_for_unit("mysql") - galera_02.wait_for_open_port(3306) - galera_03.start() - galera_03.wait_for_unit("mysql") - galera_03.wait_for_open_port(3306) - galera_02.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 37" - ) - galera_02.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; create table db2 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" - ) - galera_02.succeed("systemctl stop mysql") - galera_01.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db2 values (38);'" - ) - galera_03.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; create table db3 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" - ) - galera_01.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db3 values (39);'" - ) - galera_02.succeed("systemctl start mysql") - galera_02.wait_for_open_port(3306) - galera_02.succeed( - "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_cluster_size.*3'" - ) - galera_03.succeed( - "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_local_state_comment.*Synced'" - ) - galera_01.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db3;' -N | grep 39" - ) - galera_02.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db2;' -N | grep 38" - ) - galera_03.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 37" - ) - galera_01.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db3;'") - galera_02.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db2;'") - galera_03.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db1;'") - galera_01.crash() - galera_02.crash() - galera_03.crash() - - galera_04.start() - galera_04.wait_for_unit("mysql") - galera_04.wait_for_open_port(3306) - galera_04.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; create table db1 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" - ) - galera_04.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db1 values (41);'" - ) - galera_05.start() - galera_05.wait_for_unit("mysql") - galera_05.wait_for_open_port(3306) - galera_06.start() - galera_06.wait_for_unit("mysql") - galera_06.wait_for_open_port(3306) - galera_05.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 41" - ) - galera_05.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; create table db2 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" - ) - galera_05.succeed("systemctl stop mysql") - galera_04.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db2 values (42);'" - ) - galera_06.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; create table db3 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" - ) - galera_04.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db3 values (43);'" - ) - galera_05.succeed("systemctl start mysql") - galera_05.wait_for_open_port(3306) - galera_05.succeed( - "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_cluster_size.*3'" - ) - galera_06.succeed( - "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_local_state_comment.*Synced'" - ) - galera_04.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db3;' -N | grep 43" - ) - galera_05.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db2;' -N | grep 42" - ) - galera_06.succeed( - "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 41" - ) - galera_04.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db3;'") - galera_05.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db2;'") - galera_06.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db1;'") - ''; - }; in - lib.mapAttrs (_: mariadbPackage: makeGaleraTest { inherit mariadbPackage; }) mariadbPackages +lib.mapAttrs (_: mariadbPackage: makeGaleraTest { inherit mariadbPackage; }) mariadbPackages diff --git a/nixos/tests/mysql/mysql-autobackup.nix b/nixos/tests/mysql/mysql-autobackup.nix index b49466db0a9c..80dbb47adcd2 100644 --- a/nixos/tests/mysql/mysql-autobackup.nix +++ b/nixos/tests/mysql/mysql-autobackup.nix @@ -1,8 +1,8 @@ { system ? builtins.currentSystem, - config ? {}, + config ? { }, pkgs ? import ../../.. { inherit system config; }, - lib ? pkgs.lib + lib ? pkgs.lib, }: let @@ -10,44 +10,52 @@ let makeTest = import ./../make-test-python.nix; - makeAutobackupTest = { - package, - name ? mkTestName package, - }: makeTest { - name = "${name}-automysqlbackup"; - meta.maintainers = [ lib.maintainers.aanderse ]; + makeAutobackupTest = + { + package, + name ? mkTestName package, + }: + makeTest { + name = "${name}-automysqlbackup"; + meta.maintainers = [ lib.maintainers.aanderse ]; - nodes.machine = { - services.mysql = { - inherit package; - enable = true; - initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; + nodes.machine = { + services.mysql = { + inherit package; + enable = true; + initialDatabases = [ + { + name = "testdb"; + schema = ./testdb.sql; + } + ]; + }; + + services.automysqlbackup.enable = true; + automysqlbackup.settings.mysql_dump_port = ""; }; - services.automysqlbackup.enable = true; - }; + testScript = '' + start_all() - testScript = '' - start_all() + # Need to have mysql started so that it can be populated with data. + machine.wait_for_unit("mysql.service") - # Need to have mysql started so that it can be populated with data. - machine.wait_for_unit("mysql.service") + with subtest("Wait for testdb to be fully populated (5 rows)."): + machine.wait_until_succeeds( + "mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" + ) - with subtest("Wait for testdb to be fully populated (5 rows)."): - machine.wait_until_succeeds( - "mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" - ) + with subtest("Do a backup and wait for it to start"): + machine.start_job("automysqlbackup.service") + machine.wait_for_job("automysqlbackup.service") - with subtest("Do a backup and wait for it to start"): - machine.start_job("automysqlbackup.service") - machine.wait_for_job("automysqlbackup.service") - - with subtest("wait for backup file and check that data appears in backup"): - machine.wait_for_file("/var/backup/mysql/daily/testdb") - machine.succeed( - "${pkgs.gzip}/bin/zcat /var/backup/mysql/daily/testdb/daily_testdb_*.sql.gz | grep hello" - ) + with subtest("wait for backup file and check that data appears in backup"): + machine.wait_for_file("/var/backup/mysql/daily/testdb") + machine.succeed( + "${pkgs.gzip}/bin/zcat /var/backup/mysql/daily/testdb/daily_testdb_*.sql.gz | grep hello" + ) ''; - }; + }; in - lib.mapAttrs (_: package: makeAutobackupTest { inherit package; }) mariadbPackages +lib.mapAttrs (_: package: makeAutobackupTest { inherit package; }) mariadbPackages diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index dfa16d47968e..788770427964 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -244,28 +244,26 @@ in # see https://mariadb.org/about/#maintenance-policy for EOLs mariadb_105 = self.callPackage generic { # Supported until 2025-06-24 - # TODO should be removed - version = "10.5.25"; - hash = "sha256-lhnQ9R6GQ1dGayxjMBo0pT99/ZnxjE/UUvqyK/Obpk4="; + version = "10.5.26"; + hash = "sha256-3V+ZodMK5HNl/Bix3u/23AqzishOfZ/ZyMBP9rAZYfE="; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_106 = self.callPackage generic { # Supported until 2026-07-06 - version = "10.6.18"; - hash = "sha256-aJihER9HEwcJ4ouix70aV+S7VxAfbhCeWX1R5tOFzxg="; + version = "10.6.19"; + hash = "sha256-vOyw/3t5pBNEc2+plHEHh8FVFtUet3FfJ4w/D8t+hwM="; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; mariadb_1011 = self.callPackage generic { # Supported until 2028-02-16 - version = "10.11.8"; - hash = "sha256-XwTz4z2fHL7/BeecVNQdMCYwUAyZWu5ysGOOL5383w8="; + version = "10.11.9"; + hash = "sha256-CgAYCGTNAWGHyYb6q4AQ3iOhF7mnX5HWRWQh+JTkjSA="; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; - mariadb_110 = self.callPackage generic { - # Supported until 2024-06-07 - # TODO should be removed - version = "11.0.6"; - hash = "sha256-AYnWKUbDfG20a/GkaLqVgLy6joDwWVjsSDwzh+zPmgA="; + mariadb_114 = self.callPackage generic { + # Supported until 2029-05-29 + version = "11.4.3"; + hash = "sha256-bwAXuZAbsYl94O7SHK75/6nWbvVZNFoNim8BEwhBPs4="; inherit (self.darwin.apple_sdk.frameworks) CoreServices; }; } diff --git a/pkgs/servers/sql/mariadb/patch/0001-Fix-build-with-libxml2-2.12.patch b/pkgs/servers/sql/mariadb/patch/0001-Fix-build-with-libxml2-2.12.patch deleted file mode 100644 index a12dfb73d09d..000000000000 --- a/pkgs/servers/sql/mariadb/patch/0001-Fix-build-with-libxml2-2.12.patch +++ /dev/null @@ -1,167 +0,0 @@ -From 1f1ee5d3776af7ef56ffa3f4dcd22532c2c86c74 Mon Sep 17 00:00:00 2001 -From: Jan Tojnar -Date: Sun, 7 Jan 2024 10:19:54 +0100 -Subject: [PATCH] Fix build with libxml2 2.12 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -libxml2 2.12.0 made `xmlGetLastError()` return `const` pointer: - -https://gitlab.gnome.org/GNOME/libxml2/-/commit/61034116d0a3c8b295c6137956adc3ae55720711 - -Clang 16 does not like this: - - error: assigning to 'xmlErrorPtr' (aka '_xmlError *') from 'const xmlError *' (aka 'const _xmlError *') discards qualifiers - error: cannot initialize a variable of type 'xmlErrorPtr' (aka '_xmlError *') with an rvalue of type 'const xmlError *' (aka 'const _xmlError *') - -Let’s update the variables to `const`. -For older versions, it will be automatically converted. - -But then `xmlResetError(xmlError*)` will not like the `const` pointer: - - error: no matching function for call to 'xmlResetError' - note: candidate function not viable: 1st argument ('const xmlError *' (aka 'const _xmlError *')) would lose const qualifier - -Let’s replace it with `xmlResetLastError()`. - -ALso remove `LIBXMLDOC::Xerr` protected member property. -It was introduced in 65b0e5455b547a3d574fa77b34cce23ae3bea0a0 -along with the `xmlResetError` calls. -It does not appear to be used for anything. ---- - storage/connect/libdoc.cpp | 39 +++++++++++++++++++------------------- - 1 file changed, 19 insertions(+), 20 deletions(-) - -diff --git a/storage/connect/libdoc.cpp b/storage/connect/libdoc.cpp -index e414aa88355..10edcbc3ffa 100644 ---- a/storage/connect/libdoc.cpp -+++ b/storage/connect/libdoc.cpp -@@ -93,7 +93,6 @@ class LIBXMLDOC : public XMLDOCUMENT { - xmlXPathContextPtr Ctxp; - xmlXPathObjectPtr Xop; - xmlXPathObjectPtr NlXop; -- xmlErrorPtr Xerr; - char *Buf; // Temporary - bool Nofreelist; - }; // end of class LIBXMLDOC -@@ -327,7 +326,6 @@ LIBXMLDOC::LIBXMLDOC(char *nsl, char *nsdf, char *enc, PFBLOCK fp) - Ctxp = NULL; - Xop = NULL; - NlXop = NULL; -- Xerr = NULL; - Buf = NULL; - Nofreelist = false; - } // end of LIBXMLDOC constructor -@@ -365,8 +363,8 @@ bool LIBXMLDOC::ParseFile(PGLOBAL g, char *fn) - Encoding = (char*)Docp->encoding; - - return false; -- } else if ((Xerr = xmlGetLastError())) -- xmlResetError(Xerr); -+ } else if (xmlGetLastError()) -+ xmlResetLastError(); - - return true; - } // end of ParseFile -@@ -505,9 +503,9 @@ int LIBXMLDOC::DumpDoc(PGLOBAL g, char *ofn) - #if 1 - // This function does not crash ( - if (xmlSaveFormatFileEnc((const char *)ofn, Docp, Encoding, 0) < 0) { -- xmlErrorPtr err = xmlGetLastError(); -+ const xmlError *err = xmlGetLastError(); - strcpy(g->Message, (err) ? err->message : "Error saving XML doc"); -- xmlResetError(Xerr); -+ xmlResetLastError(); - rc = -1; - } // endif Save - // rc = xmlDocDump(of, Docp); -@@ -546,8 +544,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) - if (Nlist) { - xmlXPathFreeNodeSet(Nlist); - -- if ((Xerr = xmlGetLastError())) -- xmlResetError(Xerr); -+ if (xmlGetLastError()) -+ xmlResetLastError(); - - Nlist = NULL; - } // endif Nlist -@@ -555,8 +553,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) - if (Xop) { - xmlXPathFreeObject(Xop); - -- if ((Xerr = xmlGetLastError())) -- xmlResetError(Xerr); -+ if (xmlGetLastError()) -+ xmlResetLastError(); - - Xop = NULL; - } // endif Xop -@@ -564,8 +562,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) - if (NlXop) { - xmlXPathFreeObject(NlXop); - -- if ((Xerr = xmlGetLastError())) -- xmlResetError(Xerr); -+ if (xmlGetLastError()) -+ xmlResetLastError(); - - NlXop = NULL; - } // endif NlXop -@@ -573,8 +571,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) - if (Ctxp) { - xmlXPathFreeContext(Ctxp); - -- if ((Xerr = xmlGetLastError())) -- xmlResetError(Xerr); -+ if (xmlGetLastError()) -+ xmlResetLastError(); - - Ctxp = NULL; - } // endif Ctxp -@@ -590,6 +588,7 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) - /******************************************************************/ - xmlNodeSetPtr LIBXMLDOC::GetNodeList(PGLOBAL g, xmlNodePtr np, char *xp) - { -+ const xmlError *xerr; - xmlNodeSetPtr nl; - - if (trace(1)) -@@ -649,11 +648,11 @@ xmlNodeSetPtr LIBXMLDOC::GetNodeList(PGLOBAL g, xmlNodePtr np, char *xp) - } else - xmlXPathFreeObject(Xop); // Caused node not found - -- if ((Xerr = xmlGetLastError())) { -- strcpy(g->Message, Xerr->message); -- xmlResetError(Xerr); -+ if ((xerr = xmlGetLastError())) { -+ strcpy(g->Message, xerr->message); -+ xmlResetLastError(); - return NULL; -- } // endif Xerr -+ } // endif xerr - - } // endif Xop - -@@ -1079,7 +1078,7 @@ void XML2NODE::AddText(PGLOBAL g, PCSZ txtp) - /******************************************************************/ - void XML2NODE::DeleteChild(PGLOBAL g, PXNODE dnp) - { -- xmlErrorPtr xerr; -+ const xmlError *xerr; - - if (trace(1)) - htrc("DeleteChild: node=%p\n", dnp); -@@ -1122,7 +1121,7 @@ void XML2NODE::DeleteChild(PGLOBAL g, PXNODE dnp) - if (trace(1)) - htrc("DeleteChild: errmsg=%-.256s\n", xerr->message); - -- xmlResetError(xerr); -+ xmlResetLastError(); - } // end of DeleteChild - - /* -------------------- class XML2NODELIST ---------------------- */ --- -2.42.0 - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index bdddfc317658..d327a66542d6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -969,6 +969,7 @@ mapAliases { mailman-rss = throw "The mailman-rss package was dropped since it was unmaintained."; # Added 2024-06-21 mariadb_104 = throw "mariadb_104 has been removed from nixpkgs, please switch to another version like mariadb_106"; # Added 2023-09-11 mariadb_1010 = throw "mariadb_1010 has been removed from nixpkgs, please switch to another version like mariadb_1011"; # Added 2023-11-14 + mariadb_110 = throw "mariadb_110 has been removed from nixpkgs, please switch to another version like mariadb_114"; # Added 2024-08-15 mariadb-client = hiPrio mariadb.client; #added 2019.07.28 markdown-pp = throw "markdown-pp was removed from nixpkgs, because the upstream archived it on 2021-09-02"; # Added 2023-07-22 markmind = throw "markmind has been removed from nixpkgs, because it depended on an old version of electron"; # Added 2023-09-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48c4d657243f..757459aa5645 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25026,7 +25026,7 @@ with pkgs; mariadb_105 mariadb_106 mariadb_1011 - mariadb_110 + mariadb_114 ; mariadb = mariadb_1011; mariadb-embedded = mariadb.override { withEmbedded = true; };