From 5be1194501c6520b1de9804b9a3292a6e5d1ecc3 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Mon, 31 Mar 2025 09:28:52 +0200 Subject: [PATCH 01/49] matrix-sdk-crypto-nodejs: mark broken for cross/static --- pkgs/by-name/ma/matrix-sdk-crypto-nodejs/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/package.nix b/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/package.nix index 093d3d7a2133..b2b3d2e80767 100644 --- a/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/package.nix +++ b/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/package.nix @@ -68,5 +68,7 @@ stdenv.mkDerivation rec { dandellion ]; inherit (nodejs.meta) platforms; + # napi_build doesn't handle most cross-compilation configurations + broken = (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) || stdenv.hostPlatform.isStatic; }; } From 4fa5b123f40c00ab31581054be8838b0dd4419d1 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 10 Apr 2025 09:38:51 +0200 Subject: [PATCH 02/49] mathgl: mark cross as broken --- pkgs/by-name/ma/mathgl/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ma/mathgl/package.nix b/pkgs/by-name/ma/mathgl/package.nix index 45095e7f2bf7..9495fe9b4afd 100644 --- a/pkgs/by-name/ma/mathgl/package.nix +++ b/pkgs/by-name/ma/mathgl/package.nix @@ -35,5 +35,7 @@ stdenv.mkDerivation rec { ]; platforms = platforms.linux; maintainers = [ maintainers.GabrielDougherty ]; + # build tool make_bin is built for host + broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; }; } From 429b574bbfbe8c5dd93f241fa6b57b831f72c16c Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 10 Apr 2025 13:15:41 +0200 Subject: [PATCH 03/49] mim-solvers: exclude flaky test ref. https://github.com/machines-in-motion/mim_solvers/issues/52 --- pkgs/by-name/mi/mim-solvers/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/mi/mim-solvers/package.nix b/pkgs/by-name/mi/mim-solvers/package.nix index 2eeb9e166389..31ec43338ec0 100644 --- a/pkgs/by-name/mi/mim-solvers/package.nix +++ b/pkgs/by-name/mi/mim-solvers/package.nix @@ -51,6 +51,9 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) (lib.cmakeBool "BUILD_WITH_PROXSUITE" true) ] + ++ lib.optional (stdenv.hostPlatform.isDarwin) ( + lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'py-test-clqr-osqp'" + ) ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) ( lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'test_solvers'" ); From 80314e12ffd9554cbd6261ca9bfad7a290452b6f Mon Sep 17 00:00:00 2001 From: Lukas Werling Date: Thu, 10 Apr 2025 17:12:14 +0200 Subject: [PATCH 04/49] canon-cups-ufr2: Fix gcc rpath for libstdc++ The rpath for libstdc++ was previously set to gcc's lib64 directory. That symlink was removed in #380325, breaking the programs and libraries distributed as binaries. Also stop using lib64 for libc, in case that symlink will be removed sometime in the future. Fixes #396654 --- pkgs/by-name/ca/canon-cups-ufr2/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ca/canon-cups-ufr2/package.nix b/pkgs/by-name/ca/canon-cups-ufr2/package.nix index 8065b80aa27a..f556ff2b7346 100644 --- a/pkgs/by-name/ca/canon-cups-ufr2/package.nix +++ b/pkgs/by-name/ca/canon-cups-ufr2/package.nix @@ -180,15 +180,15 @@ stdenv.mkDerivation rec { ( cd $out/lib - patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64:$out/lib" libcanonufr2r.so.1.0.0 - patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" libcaepcmufr2.so.1.0 - patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" libColorGearCufr2.so.2.0.0 + patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${lib.getLib stdenv.cc.cc}/lib:${stdenv.cc.libc}/lib:$out/lib" libcanonufr2r.so.1.0.0 + patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${lib.getLib stdenv.cc.cc}/lib:${stdenv.cc.libc}/lib" libcaepcmufr2.so.1.0 + patchelf --set-rpath "$(cat $NIX_CC/nix-support/orig-cc)/lib:${libs pkgs}:${lib.getLib stdenv.cc.cc}/lib:${stdenv.cc.libc}/lib" libColorGearCufr2.so.2.0.0 ) ( cd $out/bin - patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64" cnsetuputil2 cnpdfdrv - patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${lib.getLib stdenv.cc.cc}/lib64:${stdenv.cc.libc}/lib64:$out/lib" cnpkbidir cnrsdrvufr2 cnpkmoduleufr2r cnjbigufr2 + patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${lib.getLib stdenv.cc.cc}/lib:${stdenv.cc.libc}/lib" cnsetuputil2 cnpdfdrv + patchelf --set-interpreter "$(cat ${ld64})" --set-rpath "${lib.makeLibraryPath buildInputs}:${lib.getLib stdenv.cc.cc}/lib:${stdenv.cc.libc}/lib:$out/lib" cnpkbidir cnrsdrvufr2 cnpkmoduleufr2r cnjbigufr2 wrapProgram $out/bin/cnrsdrvufr2 \ --prefix LD_LIBRARY_PATH ":" "$out/lib" \ From 10d05fd8f9e0aff775860cad8e3178b6f7b92560 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Apr 2025 13:24:26 +0000 Subject: [PATCH 05/49] ngtcp2-gnutls: 1.11.0 -> 1.12.0 --- pkgs/development/libraries/ngtcp2/gnutls.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix index accb78d9c411..7d76c4b37941 100644 --- a/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - hash = "sha256-m9kJrEDYfxPSreH14M/h/f+7vgk6Ho6pmvVdJ1S8acc="; + hash = "sha256-WAZKlIGwSn/U3MPF2RDOscZ5EVqQyViViy9beQeroNs="; }; outputs = [ From eaf4816ddbae10c97c6e568d70a779e5dbf001ac Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 26 Apr 2025 17:25:44 +0200 Subject: [PATCH 06/49] git-up: relax termcolor, unbreak --- pkgs/applications/version-management/git-up/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix index 6c96b5f9b79c..fb799c78e417 100644 --- a/pkgs/applications/version-management/git-up/default.nix +++ b/pkgs/applications/version-management/git-up/default.nix @@ -16,6 +16,10 @@ pythonPackages.buildPythonApplication rec { hash = "sha256-SncbnK6LxsleKRa/sSCm/8dsgPw/XJGvYfkcIeWYDy4="; }; + pythonRelaxDeps = [ + "termcolor" + ]; + nativeBuildInputs = with pythonPackages; [ poetry-core ]; From 854b06b4656bb3804946b3b974c9bb05245a876a Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 26 Apr 2025 17:30:46 +0200 Subject: [PATCH 07/49] git-up: modernize --- .../version-management/git-up/default.nix | 43 +++++++++---------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix index fb799c78e417..a63266e5e0c8 100644 --- a/pkgs/applications/version-management/git-up/default.nix +++ b/pkgs/applications/version-management/git-up/default.nix @@ -1,11 +1,12 @@ { lib, - pythonPackages, fetchPypi, + python3Packages, + writableTmpDirAsHomeHook, git, }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "git-up"; version = "2.3.0"; format = "pyproject"; @@ -20,45 +21,41 @@ pythonPackages.buildPythonApplication rec { "termcolor" ]; - nativeBuildInputs = with pythonPackages; [ + nativeBuildInputs = with python3Packages; [ poetry-core ]; - # git should be on path for tool to work correctly - propagatedBuildInputs = - [ - git - ] - ++ (with pythonPackages; [ - colorama - gitpython - termcolor - ]); + # required in PATH for tool to work + propagatedBuildInputs = [ git ]; + + dependencies = with python3Packages; [ + colorama + gitpython + termcolor + ]; nativeCheckInputs = [ git - pythonPackages.pytest7CheckHook + python3Packages.pytest7CheckHook + writableTmpDirAsHomeHook ]; - # 1. git fails to run as it cannot detect the email address, so we set it - # 2. $HOME is by default not a valid dir, so we have to set that too - # https://github.com/NixOS/nixpkgs/issues/12591 + # git fails without email address preCheck = '' - export HOME=$TMPDIR git config --global user.email "nobody@example.com" git config --global user.name "Nobody" ''; postInstall = '' - rm -r $out/${pythonPackages.python.sitePackages}/PyGitUp/tests + rm -r $out/${python3Packages.python.sitePackages}/PyGitUp/tests ''; - meta = with lib; { + meta = { homepage = "https://github.com/msiemens/PyGitUp"; description = "Git pull replacement that rebases all local branches when pulling"; - license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.all; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ peterhoeg ]; + platforms = lib.platforms.all; mainProgram = "git-up"; }; } From a34dd0a419955187643cbc25a7bcaedda4023a23 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 26 Apr 2025 17:34:51 +0200 Subject: [PATCH 08/49] git-up: move to by-name --- .../git-up/default.nix => by-name/gi/git-up/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 4 deletions(-) rename pkgs/{applications/version-management/git-up/default.nix => by-name/gi/git-up/package.nix} (100%) diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/by-name/gi/git-up/package.nix similarity index 100% rename from pkgs/applications/version-management/git-up/default.nix rename to pkgs/by-name/gi/git-up/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 038c4fa1352b..3be6b7c1d311 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1367,10 +1367,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - git-up = callPackage ../applications/version-management/git-up { - pythonPackages = python3Packages; - }; - gittyup = libsForQt5.callPackage ../applications/version-management/gittyup { }; lucky-commit = callPackage ../applications/version-management/lucky-commit { From 8179f88d4dba78a3066e8b691a3653972bd21c4c Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 27 Apr 2025 22:23:44 +0200 Subject: [PATCH 09/49] git-up: modernize, use gitMinimal --- pkgs/by-name/gi/git-up/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gi/git-up/package.nix b/pkgs/by-name/gi/git-up/package.nix index a63266e5e0c8..5e37304382db 100644 --- a/pkgs/by-name/gi/git-up/package.nix +++ b/pkgs/by-name/gi/git-up/package.nix @@ -3,7 +3,7 @@ fetchPypi, python3Packages, writableTmpDirAsHomeHook, - git, + gitMinimal, }: python3Packages.buildPythonApplication rec { @@ -21,12 +21,12 @@ python3Packages.buildPythonApplication rec { "termcolor" ]; - nativeBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ poetry-core ]; # required in PATH for tool to work - propagatedBuildInputs = [ git ]; + propagatedBuildInputs = [ gitMinimal ]; dependencies = with python3Packages; [ colorama @@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec { ]; nativeCheckInputs = [ - git + gitMinimal python3Packages.pytest7CheckHook writableTmpDirAsHomeHook ]; From c804c4f302b8b13a6c89de369eea6eb4808d6416 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sun, 27 Apr 2025 18:55:42 +0200 Subject: [PATCH 10/49] yarn-berry: fix and enable strictDeps --- pkgs/by-name/ya/yarn-berry/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ya/yarn-berry/package.nix b/pkgs/by-name/ya/yarn-berry/package.nix index 1152e50477cb..3f71afbb4cee 100644 --- a/pkgs/by-name/ya/yarn-berry/package.nix +++ b/pkgs/by-name/ya/yarn-berry/package.nix @@ -32,9 +32,12 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ + nodejs yarn ]; + strictDeps = true; + dontConfigure = true; buildPhase = '' From 58ed20b9c74542f4bf733b010486dbc036add88f Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 29 Apr 2025 22:25:43 +0800 Subject: [PATCH 11/49] gtypist: 2.9.5 -> 2.10.1 --- pkgs/by-name/gt/gtypist/package.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/gt/gtypist/package.nix b/pkgs/by-name/gt/gtypist/package.nix index 59628e7a64d5..e1ee7c369730 100644 --- a/pkgs/by-name/gt/gtypist/package.nix +++ b/pkgs/by-name/gt/gtypist/package.nix @@ -9,18 +9,19 @@ fortune, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtypist"; - version = "2.9.5"; + version = "2.10.1"; src = fetchurl { - url = "mirror://gnu/gtypist/gtypist-${version}.tar.xz"; - sha256 = "0xzrkkmj0b1dw3yr0m9hml2y634cc4h61im6zwcq57s7285z8fn1"; + url = "mirror://gnu/gtypist/gtypist-${finalAttrs.version}.tar.xz"; + hash = "sha256-ymGAVOkfHtXvBD/MQ1ALutcByVnDGETUaI/yKEmsJS0="; }; - CFLAGS = "-std=gnu89"; + CFLAGS = "-std=gnu99"; nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ ncurses perl @@ -32,11 +33,11 @@ stdenv.mkDerivation rec { --prefix PATH : "${fortune}/bin" \ ''; - meta = with lib; { + meta = { homepage = "https://www.gnu.org/software/gtypist"; description = "Universal typing tutor"; - license = licenses.gpl3Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ pSub ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ pSub ]; }; -} +}) From 325e7cd46bbed911bcc5cef75e82cf87731f2adc Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Tue, 29 Apr 2025 22:34:37 +0200 Subject: [PATCH 12/49] openmw-tes3mp: add fix for gcc14 --- pkgs/games/openmw/tes3mp-gcc14-fix.patch | 25 ++++++++++++++++++++++++ pkgs/games/openmw/tes3mp.nix | 3 +++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/games/openmw/tes3mp-gcc14-fix.patch diff --git a/pkgs/games/openmw/tes3mp-gcc14-fix.patch b/pkgs/games/openmw/tes3mp-gcc14-fix.patch new file mode 100644 index 000000000000..1c8d8994a598 --- /dev/null +++ b/pkgs/games/openmw/tes3mp-gcc14-fix.patch @@ -0,0 +1,25 @@ +diff --git a/apps/openmw/mwstate/charactermanager.hpp b/apps/openmw/mwstate/charactermanager.hpp +index 2daf734..b77d2a8 100644 +--- a/apps/openmw/mwstate/charactermanager.hpp ++++ b/apps/openmw/mwstate/charactermanager.hpp +@@ -1,6 +1,8 @@ + #ifndef GAME_STATE_CHARACTERMANAGER_H + #define GAME_STATE_CHARACTERMANAGER_H + ++#include ++ + #include + + #include "character.hpp" +diff --git a/components/vfs/filesystemarchive.cpp b/components/vfs/filesystemarchive.cpp +index 6eef4b9..608323e 100644 +--- a/components/vfs/filesystemarchive.cpp ++++ b/components/vfs/filesystemarchive.cpp +@@ -1,5 +1,7 @@ + #include "filesystemarchive.hpp" + ++#include ++ + #include + + #include diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index f94d288f93d9..60dbf2d23a82 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -114,6 +114,9 @@ let # https://github.com/TES3MP/openmw-tes3mp/issues/552 ./tes3mp.patch + + # https://github.com/TES3MP/TES3MP/pull/691 + ./tes3mp-gcc14-fix.patch ]; env.NIX_CFLAGS_COMPILE = "-fpermissive"; From 8bdcc2319db669fca4be321c97263b2cd82a2ee8 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 30 Apr 2025 16:08:59 +0200 Subject: [PATCH 13/49] openapi-down-convert: init at 0.14.1 --- .../op/openapi-down-convert/package.nix | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/op/openapi-down-convert/package.nix diff --git a/pkgs/by-name/op/openapi-down-convert/package.nix b/pkgs/by-name/op/openapi-down-convert/package.nix new file mode 100644 index 000000000000..77d0cb66e054 --- /dev/null +++ b/pkgs/by-name/op/openapi-down-convert/package.nix @@ -0,0 +1,45 @@ +{ + lib, + fetchFromGitHub, + buildNpmPackage, + nodejs, + versionCheckHook, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "openapi-down-convert"; + version = "0.14.1"; + + src = fetchFromGitHub { + owner = "apiture"; + repo = "openapi-down-convert"; + tag = "v${finalAttrs.version}"; + hash = "sha256-8csxj2HfOb9agDmwNmksNaiQhRd+3D1tf0vWU2w+XWw="; + }; + + npmDepsHash = "sha256-5VgFAiphahDKz3ZhzNEdQOFxvhvDy+S/qOClqBgMzSg="; + + postInstall = '' + find $out/lib -type f \( -name '*.ts' \) -delete + rm -r $out/lib/node_modules/@apiture/openapi-down-convert/node_modules/typescript + rm $out/lib/node_modules/@apiture/openapi-down-convert/node_modules/.bin/* + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Convert an OpenAPI 3.1.x document to OpenAPI 3.0.x format"; + homepage = "https://github.com/apiture/openapi-down-convert"; + changelog = "https://github.com/apiture/openapi-down-convert/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ fliegendewurst ]; + mainProgram = "openapi-down-convert"; + }; +}) From 34feb229d5e52cd59190fe98d711e5b6a50e4351 Mon Sep 17 00:00:00 2001 From: emaryn Date: Thu, 1 May 2025 10:19:31 +0800 Subject: [PATCH 14/49] cherry-studio: fix update script --- pkgs/by-name/ch/cherry-studio/update.sh | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/cherry-studio/update.sh b/pkgs/by-name/ch/cherry-studio/update.sh index 78609183ed43..b76c758d637b 100755 --- a/pkgs/by-name/ch/cherry-studio/update.sh +++ b/pkgs/by-name/ch/cherry-studio/update.sh @@ -1,8 +1,10 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused jq nix bash coreutils nix-update +#!nix-shell -i bash -p curl gnused jq nix bash coreutils nix-update yarn-berry.yarn-berry-fetcher set -eou pipefail +PACKAGE_DIR=$(realpath $(dirname $0)) + latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/CherryHQ/cherry-studio/releases/latest | jq --raw-output .tag_name) latestVersion=$(echo "$latestTag" | sed 's/^v//') @@ -13,4 +15,14 @@ if [[ "$currentVersion" == "$latestVersion" ]]; then exit 0 fi -nix-update cherry-studio --version "$latestVersion" +nix-update cherry-studio --version "$latestVersion" || true + +export HOME=$(mktemp -d) +src=$(nix-build --no-link $PWD -A cherry-studio.src) +TMPDIR=$(mktemp -d) +cp --recursive --no-preserve=mode $src/* $TMPDIR +cd $TMPDIR +yarn-berry-fetcher missing-hashes yarn.lock >$PACKAGE_DIR/missing-hashes.json +rm -rf $TMPDIR + +nix-update cherry-studio --version skip || true From be8e123520bf74c2dfb20b44112633aa87542577 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 1 May 2025 05:07:50 +0200 Subject: [PATCH 15/49] gcompris: add extra-cmake-modules This was removed in #401292, and since then the shortcut disappeared from the launcher, because `share/applications/org.kde.gcompris.desktop` installation is conditioned to ECM: https://invent.kde.org/education/gcompris/-/blob/master/CMakeLists.txt?ref_type=heads#L142 --- pkgs/games/gcompris/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix index 3d533b702114..60d87033272f 100644 --- a/pkgs/games/gcompris/default.nix +++ b/pkgs/games/gcompris/default.nix @@ -15,6 +15,7 @@ qtmultimedia, qtsensors, qttools, + extra-cmake-modules, }: stdenv.mkDerivation (finalAttrs: { @@ -33,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake + extra-cmake-modules gettext ninja qttools From 61c241f1c7100fdffb64a2261cb66f029e245b16 Mon Sep 17 00:00:00 2001 From: emaryn Date: Thu, 1 May 2025 12:13:31 +0800 Subject: [PATCH 16/49] cherry-studio: 1.2.7 -> 1.2.10 --- .../ch/cherry-studio/missing-hashes.json | 190 +++++++++--------- pkgs/by-name/ch/cherry-studio/package.nix | 16 +- 2 files changed, 113 insertions(+), 93 deletions(-) diff --git a/pkgs/by-name/ch/cherry-studio/missing-hashes.json b/pkgs/by-name/ch/cherry-studio/missing-hashes.json index ab846757d411..1240077e0388 100644 --- a/pkgs/by-name/ch/cherry-studio/missing-hashes.json +++ b/pkgs/by-name/ch/cherry-studio/missing-hashes.json @@ -1,92 +1,102 @@ { - "@esbuild/aix-ppc64@npm:0.21.5": "1f48fea96ab4fbc2921756361bc8a0c4d0690f14dc2298a357aa3d436bcd1cd646d490e5d71c4e0fb46b9e04401bc93153d6886456dd0665b6758be643c95a16", - "@esbuild/aix-ppc64@npm:0.25.2": "e25252d47d27d5e15a09ba7e7e906fe35d90a363e1eec7bc1e054c066bea6f89364139385008f78e8b4523ebaecb1f7a678213c8fcc2cd0309d539bbc455fd05", - "@esbuild/android-arm64@npm:0.21.5": "7a4831b0886c165ed671f0094dcd491235fe503364a261379c84e2225a3c3230a06bce1d3a02316fa8a040b0ffede56c617746dc3b5550549ae3fb07095bb20d", - "@esbuild/android-arm64@npm:0.25.2": "b387ab30ec70902c81ca1231a7838ccc993ad8dff9561a5ec7d7d4e5f03426153d42e496985a02539bce55f6d1048156f36e24a29f61fa5fd8e0587f62696703", - "@esbuild/android-arm@npm:0.21.5": "9fa871018a9f2198f40fde2c672fcb1b9d3ab5ee602644ea4cf68c548ee2c0b6c60ad851ce85219f84886fd29757d8c49bac28ea48a2a16708a088e32dfe673a", - "@esbuild/android-arm@npm:0.25.2": "8e7efb22407ad9a985ff5a09dc0d2b895126c6ccca470db671ca0a3e3026f79666af20ce5d296311f5d056e95ca71e743feeae526f94dcaacb5a6969f9963283", - "@esbuild/android-x64@npm:0.21.5": "24e477ccdaf1437cabe8710bc052a13b975a53617094a225e39823a1c562a71ef975d860ab895c129a813302495d85387143e27068e62fc897a2ac0335e4a2f6", - "@esbuild/android-x64@npm:0.25.2": "66256eee6168c2f903c45c82863f1377f525dc7de0fc902fca412a44d0abbb8a25761fb9e10c8663b25b0f816d86b7e353d2b77ab39eae95234333f9d233ddc4", - "@esbuild/darwin-arm64@npm:0.21.5": "67b0e4ebc870d0babb6721328f02b0e75eca5ee8f176220fa194ac5897ce76a27aa4f6d724389a74e1517670f70e766fe03c30875fdebeee5b1f7b22e99c5a1f", - "@esbuild/darwin-arm64@npm:0.25.2": "36a568a779000133d077e2272181232f52939c3e0b0b986ad3f3fd6ab29628c148e88cd857f6de41a16e22e6a252bb16680f91c00c7d813690fa9bc060f58386", - "@esbuild/darwin-x64@npm:0.21.5": "a4b6df47edf4b1e91eeca9d7af18f538e25615e00763709a4cc24a8918e7ac93b9bfc2ef9f44086f16257d05ad99e23c1213a7a1397475d1a78f0a1e773af89a", - "@esbuild/darwin-x64@npm:0.25.2": "b761a20f8db7bf0499f6cba51c72104e733d9186d6f34a7f5e4590c02ecc2f9b84cd02c4e7bd3dade4156b7f92015cdbddc516dd1e4859233e3155cb0fecda58", - "@esbuild/freebsd-arm64@npm:0.21.5": "a4cf357807f2ea445b5191b8e5488070b567e2b534dba24ce6f8f1a332598ee0b9ffa41b3b0e55cd0cf57e2b56f0f1d84413faba182b81cb43bf19edf58a7654", - "@esbuild/freebsd-arm64@npm:0.25.2": "8f869d6200dba388ac4c008c7a5b6522f44797370a12f94fd19e37b6cd76bdbdf48d0fa893b5ce200a538a151281e9f71e985f82ec8b8c96f16075e45266c718", - "@esbuild/freebsd-x64@npm:0.21.5": "8957c1345196e5dabd7d9f290b5292161f5d9955f269051fa7873118cfb5a20c31d70771ea3560b513f879d0948ba32fba915fb1b387571c4fbbb1fbeaf2dd87", - "@esbuild/freebsd-x64@npm:0.25.2": "6cdfb6c6d6f6ead324a9ee75ab1068305672207cf1d3189bcf5599ec158e0eb07d74ff63597e389777163b4399da1cc6164b918a7ea9e798e7fd45eee6aad9bb", - "@esbuild/linux-arm64@npm:0.21.5": "1b95b17ed94eb977e38ea9130e677551b7cf0ccccdb3f23a9f8b59b5d67400817c2a417e4f043295bd3f67796853da2a1b1a8ca201ffe745efb40a144dfdc99c", - "@esbuild/linux-arm64@npm:0.25.2": "a0d51ec6e91e97461916eb6c25b12a8ea6b58ec2f3d91199c0c3f02ec569e98ff1389700250d4664d8394d3d5b5a051d695b34bfe77ab4a12985dfc18f315b73", - "@esbuild/linux-arm@npm:0.21.5": "6bfcd098ada5e6117d028777e5cc58456c2f570157fa0a0dce30c9d05b8389b86f74bf6b862534bf6994d342946c98b6774e1820880fd289765864b668e94c17", - "@esbuild/linux-arm@npm:0.25.2": "5a4cf4045a2a5949dc8875dbad9a82fde7333d3f59b66d8cb614b34b76a7fb715a8d74e41f0788104bcef0436108ca548d71a543f582073e0458e20370dbb802", - "@esbuild/linux-ia32@npm:0.21.5": "73c249c9918f0c9a9268ffe14fe745f5e7564b309dcea213da08a5e4367ffdfc8df4b004c70f80269dce0f653a3280cfdd8bf9a7a616b5b60649e4faea6e69b5", - "@esbuild/linux-ia32@npm:0.25.2": "535c1755ed95a47b05b865361d2efbef3490f05815743c0d2372f55a2e14f0cc1d5ed6e5dd6f91c7aea871ea2f64cea021eea6e714027148489c54edc6e2b19f", - "@esbuild/linux-loong64@npm:0.21.5": "60977efe24b3b6e1461d49da07dd57c1234992b9d2e6ac7d0dedfee538321d42be25e496ffb193121d3a6c6ca6ea6722b880e95695824dcc6643a3d9426b2296", - "@esbuild/linux-loong64@npm:0.25.2": "8ff82f5cdd7a9490dfb3be64c990841d2a8e1a0ce83d76fa8d5e9b0ba7aa91ca725f338ff43b4d69a18744905f1730adf87a7f8359ae839030663e0bbe2807e2", - "@esbuild/linux-mips64el@npm:0.21.5": "20fb6c8f6e58f66cd4351034858b2ad85bda4144576b180979305cfabed43780a71934e9f176e476c719f14e37253b231a43d46638ad232989d5f4dd72ec6b75", - "@esbuild/linux-mips64el@npm:0.25.2": "382520bf655329d04f65e041f9bf774d11a2232bdf5125934732db915c179b1172ec3429722d9f02f46ee5bad7b70372872bfd003d7c1cc5ec95b7ca6ec8a983", - "@esbuild/linux-ppc64@npm:0.21.5": "69f2ef1d127f48bc14cec479ae1a96dbf5fea651e0a3f148486f73495d2acb91acdaa164cd80648844916f05e7f9f9665a1864dd394e7f9acf96bea70937e6b5", - "@esbuild/linux-ppc64@npm:0.25.2": "c5736195867e9c441cabd0a2cbaa62f91c4e4963ed7490018d09a932d549e1d281411ddf9dbd4a4b68f0c0298c1321ba15fd4e493cdc3dea3e14b7a6207b12f8", - "@esbuild/linux-riscv64@npm:0.21.5": "60c749d87c0f67cc67c5cc0d82aa597b7a807bc52510a16960337433bdbc8fa9f3c46eba98080106c0971e404e2250ca11c441bb4ae5b7a7d78b4095e3a70363", - "@esbuild/linux-riscv64@npm:0.25.2": "c72879775daded232fb2e36a6fe26058ec1ccd1f5dd6a76b4e8da700c6dd20cb15b684bce34569cadd41f25a0a53bd2037994279856bb3148f8c16055adcaf68", - "@esbuild/linux-s390x@npm:0.21.5": "a14ff0484b962b374fd1e4662a53f8dd8999ba39fcf891f15631dfb2802c8d18893d6e366c42d28d55885e5804b7d6252c0e3cee038c241285c9b537ef12b4ae", - "@esbuild/linux-s390x@npm:0.25.2": "d8810561312c4c7705f3c580ef8cd38e2768feb19ebf2899595a227f59dfb6ca35182f8ad7ca65d503cc5d9c688fe742002243387aa09b98b8c32aabc522ac4e", - "@esbuild/linux-x64@npm:0.21.5": "9e5663fcace9c8456e9934a9ed6e7428db4080024eef3bfeaf82d476120bd881382c958be2785463d6b44467b3d3f870d6cce09a9cb37bcef19afeb97814d674", - "@esbuild/linux-x64@npm:0.25.2": "32c8a5f7d0640655ebf60f379ee2b037fe83f3f0edad911a9098505e6ac589c5f2873ff441017183626a19d334e3bb59f58411f2d5474eb7222917575593abea", - "@esbuild/netbsd-arm64@npm:0.25.2": "0b7f77ec46163feac839b17b94e7db87edf61441bd9a67115722bf72781021c8220576a2e2c70bbca45b89a1e69a6b132f5489b59e84241b197272c1ee080304", - "@esbuild/netbsd-x64@npm:0.21.5": "3cb6115c4557d653c7ad6d2be5b4ed7a688b14d85b7b7108a1a57dda0b2cca3f8ed13560fa6639da8788f860b75eb714a17cfb7ba8f967e93bdf40c9b3a1cde1", - "@esbuild/netbsd-x64@npm:0.25.2": "6d6686f5d2eb79b042bd4f38dc95e73a8e290a057be1b6afc42867830c9cf2313600b4fd53287f2f418c9f454bf5df02154b16dcfbfc33a6eb2ce9722a4eecc1", - "@esbuild/openbsd-arm64@npm:0.25.2": "8a08c16440c6389623bbacb717412635aff61a1552c917e707d71da1dc92c618eea9a9aa1606a4a4f322216f100ede658523baec2e82b1f11b4efd523d491173", - "@esbuild/openbsd-x64@npm:0.21.5": "1caf0b502d6e2612ffd3e62589de2b9cd48cd742818746011d437e2d5787df4984f7c17b7a536aa20f12d04e519c859d755a7b57e6db0ed277054bd9c1036e85", - "@esbuild/openbsd-x64@npm:0.25.2": "43baf3248bb460e169cb1b5f26f5eb720088fa0d467c77f4f72c6cfa8e6d7b7794c52ed5e4a9a2113db53313c5fec86e352c94939abf601ab22d5e6e9addc4e5", - "@esbuild/sunos-x64@npm:0.21.5": "676da7301c7c600bb7de2523ecf5d877128da3c125fd8136533f5be38ca15d9f800b2fbbd396ca37d44c5daa51b8124d8a4728bb18245cd2becb3191b897c45a", - "@esbuild/sunos-x64@npm:0.25.2": "0babbb99d3bc3ed818b2b01fbf65ebbf5930defb850e5a5a94a3ba5fc7bc2463d561c07af0d3ac6d6d0197c86682750ceb47abf7d293dd3222b1bd33da9f8aa5", - "@esbuild/win32-arm64@npm:0.21.5": "9b2ab87429efd3c2697dc5c7948ea57b57757b6e4709469e773b73cd5fe4b7fda5912073f4c3bdf9d0346b8f3ae443367a63bcd51de24fb81b9f592712eb3366", - "@esbuild/win32-arm64@npm:0.25.2": "205aab6fc7b0ca7ee992cd24d73550110c1f79dc2ca724384bb52aa95111248df022375cd648314bd7eeb42083d576c55572f3d39d4ddcd82fc7372f1e7688b0", - "@esbuild/win32-ia32@npm:0.21.5": "c1fe3276507d82202c464cd4809e67e6f151e29ed9de05c32d086dfe30207db15e646911ebc7f50df659891bfee292a25062792c589c2ff769be238c6b5fb8be", - "@esbuild/win32-ia32@npm:0.25.2": "aa38c0e082e3111e84929a64638cce1c3e1114218726e41c99bf239f2c05be94fb6fe1083366aa342bbd8e75fd449a6a3bcae9b6b3b84066a3a3882dcbaa0090", - "@esbuild/win32-x64@npm:0.21.5": "5d7b28baa9c22684d35ec0515f6d36f8f583f26733c8e84c7f78edf17b8a7d133819267486f2fd66f20ca3a810896f11c3c81106d745040c2f07ade314846bf1", - "@esbuild/win32-x64@npm:0.25.2": "2f2d147c610a3c3ab0f0f97132e4421464d3d38b835d989e8c324b7397e2592cd05485ec1998ae352f06d3191dd1d71c24f94f63f7c70cd8ea8a4c85441502a9", - "@libsql/darwin-arm64@npm:0.4.7": "161ac6b537e39e33c65a7f06c16152ccd5077129b8321b5d0082e008054c47dbc32563d39a47e223d09994457211582ff3760ffa5523f2dd3cfac1dd726a577a", - "@libsql/darwin-x64@npm:0.4.7": "45c85d00566507f19474f9ae4b6453fa8fff10994147751df2dd2177edf9961520af54156d2d41b23cdfaaf2b219ea4ebd4b44a868e890088fc2283c1224752b", - "@libsql/linux-arm64-gnu@npm:0.4.7": "c4126b0d717b45a8d1d66797bd7447fdaf53631277dac0250e0aa0267e279493b114b3823407e49da0e2928d6595d3a28370acb99c43424e8bc7e11434cae5f8", - "@libsql/linux-arm64-musl@npm:0.4.7": "13eef982caf2b73cebabde76b8e209ddea27d2ff0e6228a56704a50ad41975ff03a15d90bec6ccc908cb16355d685903719676f7a91c92d20a68eecff4a4f0b6", - "@libsql/linux-x64-gnu@npm:0.4.7": "524bf04f98f7a91e343b294262a627a965f626082b63b998c8019d105380caa2435e240f6085103751f87919ac2415aba97075696822915bf1a4e4492d9376f5", - "@libsql/linux-x64-musl@npm:0.4.7": "227cddb499cbbf677c1dfaeeb8bd787d4c6d4cbf50c94ac1632348f26b412d2f8bacdb0131050c507d1961f96f8bbff2d8b7949f26f1dcebb61e115da9253aa0", - "@libsql/win32-x64-msvc@npm:0.4.7": "2fcb8715b6f0571dec145eaaf3fd53c7c5aa5bf408fe1be9d84b10adc8a909bb6ee60b45e0d7052b0c1722c30ac212356a3f1adcdf7f57d5a59b48f36ca5bdf5", - "@parcel/watcher-android-arm64@npm:2.5.1": "f99d569e4f6cf78a1b0097fb9d4682cb201a74370ae440c531da4e1d5021e46141bfcdf8ef708b51a5b9cb1c30f78eea933ce75216d5eeb7b969a2ad27c68e4a", - "@parcel/watcher-darwin-arm64@npm:2.5.1": "973c7ef3c94608da9cd1b20b18b9a7de2fb46fe44553731fe372b640de524491976150d0845f3d5953b74ed8ea469cb8d18a48651d0e5fb82f549a6b46b54f79", - "@parcel/watcher-darwin-x64@npm:2.5.1": "848c5516aed9c36e14751200dbbf57e83c0bd46cdab0932df33db120e66b9596de18eeb98980e319efde84014f67d9e7924d7555383d8ffcefe35c501166b84b", - "@parcel/watcher-freebsd-x64@npm:2.5.1": "cbd2b7884bc92422edabc0c74c3fbc06512bb7300fc137aaff2e96f46f61e5272265a0b5d230acc82a0e777b0c11661f0b8b7f89a9342c0920b752436dd2c750", - "@parcel/watcher-linux-arm-glibc@npm:2.5.1": "f2e1ec14dbb0f85a84a75f55fd7721598694976ba3ad439832b57e558b0d9240cc80ff83053fb8cf7caffb0592d51bb39d325112763ec1734924b49d4ba9c144", - "@parcel/watcher-linux-arm-musl@npm:2.5.1": "83344c7ecda2e79db59d711bcee0c3fa26922989139c031bd762cf3d5bfb191797e22e9ed6072690b822dfd62629623ba4e7eedb3c41930a987fc3d4106000e1", - "@parcel/watcher-linux-arm64-glibc@npm:2.5.1": "562231feb159a294752378bebecc69a2d33366a9d877835844578799f8536398006e0e570849f9e2db04085a3ea82131459cd10fd6b42dea10cd73bd0c9ca13e", - "@parcel/watcher-linux-arm64-musl@npm:2.5.1": "f62db52a90ebbaa29ca9900e6b9bd3fc6e5c650741bbde9a2742cbc332c678b753fc6a596d67659394fd9262aa826463ea667d18cc554bcaaac9e8da1a2a29d0", - "@parcel/watcher-linux-x64-glibc@npm:2.5.1": "425e557991fde5092d6a9e20be71810600415e5fa157dca0b39bd8db86653d3ee7b037305261c8782d1a065f2a64d235e17b57876b26f5bb0dd7a9bdbe364690", - "@parcel/watcher-linux-x64-musl@npm:2.5.1": "4dbb066ba9478c8b8de39e3c1083cbb74f86f03eaf4445603e69909d6c072134644316faa20a2445419b9fe1a8063ade7b5331a5766d807ee0b15b8a70c59a2d", - "@parcel/watcher-win32-arm64@npm:2.5.1": "e015314d6b9b727cbe25eedf963ca8b23bf6d4e78d3c28008bd0d2657940ad54a271330486df3a93a5f1a30f2b8d052d14415b85cc7e7b747c6c73b5dc055628", - "@parcel/watcher-win32-ia32@npm:2.5.1": "920b6ad6a2095aeb9c2d329c5118472a3c14669fa93eaa99aa8050c76c5c2d3d76d92677167ed748c2ac5487c568d5df16d5d94f4bc7c354094fccd8e0d6350c", - "@parcel/watcher-win32-x64@npm:2.5.1": "8f1c8e41ec9f86e4dcd0d4db0a077742d5dcc853f15ea888387183e34e2efcff09fd1cc9ec46fc1121b9ad4ddc0e221283f2ffb23cfd7dbcbb8b03060b461963", - "@rollup/rollup-android-arm-eabi@npm:4.40.0": "723053f558eaeeb0a1fbf3b3063b930d3b1267a6aba211719927b0467f48513a514a05391689298a64624e98daa005e4685ef668787ebc228fd0527a5f17b419", - "@rollup/rollup-android-arm64@npm:4.40.0": "2562821c7032d2d95b891f47f02291d714d072fd91b3dbd07c528a7543f5e7d2458903cc38829feec311f1ebca6e34624262ae2e10aa32a0532b83c564db94cc", - "@rollup/rollup-darwin-arm64@npm:4.40.0": "cde6c2f4fe819131f65f5d19f8d1fd4889a4b8cc130cb30582fde72c79e388ef4644f57c7b03f453d4048043524ca067d5e2b4b505a5568840c73021fb74b572", - "@rollup/rollup-darwin-x64@npm:4.40.0": "28c269104ff10f0ab87a30c93139662780b0b6b4877a95cede7d66e833d478d1eb2f5aa275f60decb8383b2c05161f315902ad8fa1a52fa76283a05ceb32bf6b", - "@rollup/rollup-freebsd-arm64@npm:4.40.0": "27e99df8d1c5f0dfaead8fa6ce3025c5f959b4803e7683d95183761b1ecada4d877bd7f36465c424657ef650eac6199ddcf4911eda6367555633819454a5548d", - "@rollup/rollup-freebsd-x64@npm:4.40.0": "3422ce75f0fe774925763b1b63dded9aee56038d167af0b7f8ca0e468a8fae86d6a8aecd0b86a79718b8fc78c5ad987ba5b98be17b95fdcd48e4307749376e1b", - "@rollup/rollup-linux-arm-gnueabihf@npm:4.40.0": "b32cd2a73db75926722dfd42a6c5c6f2f1631f70a8d261317a0ce54e2c5dcee849c0a59cd85de0c0c7bbea9defb4f6649b1354871e6ac7f637cc22673d1486c1", - "@rollup/rollup-linux-arm-musleabihf@npm:4.40.0": "1c1d95fe81ee31d0d9cd75258865d35d2afccd8255b856c0da9a3c8afa012feb6b9557d1c234af8f4cc5dfd9d397564c650fe2e8769cb4407f626058c2e19d9c", - "@rollup/rollup-linux-arm64-gnu@npm:4.40.0": "a8d071163d135e992023a374660a72cc94af4d77a711e7720d4e3fc544a7af037add4839ef8d061503e5320ee80defd35b43a68cebad0105d16cfd870387934c", - "@rollup/rollup-linux-arm64-musl@npm:4.40.0": "5582761d9426caccee50beb1fdb06ebb16fba540eabde06e21d18f59667f7c6c99ca0c2743d1b9cdb54a3d0b28445befad52c76412632bf0d79f280022acc630", - "@rollup/rollup-linux-loongarch64-gnu@npm:4.40.0": "6d65384886c655b4a9190a2c8e3cd99d7049d13864be0f9b06c32a23ba1242bd09be0e9cba9425898a48b41bba52eb98223e34e3943924370a68f7c7800f66b2", - "@rollup/rollup-linux-powerpc64le-gnu@npm:4.40.0": "ebe38407efd0e45e92f939fe725e64695096c4389747b81f241e8a5d655526615e81512f3d61deae6aaf60669328a9bc93ac352351d6ccf8f1746caeb44bd7ab", - "@rollup/rollup-linux-riscv64-gnu@npm:4.40.0": "32cc2e2d03eadca60f42ba14af9723584c1ef7ee29f8a79578aacd9ce17e287d1f841aa926278d4b7cbf0f6d054c4ec045873a24c67279ca37f20e999f24bd4e", - "@rollup/rollup-linux-riscv64-musl@npm:4.40.0": "507c785bde98633f0139baccce0635047d43b19fb1d1fc770d4d88b11ef62b7885b0dac51a42c5f3e05bc0a56480928ae6304898884f0b5b0e56ad0cc98920f6", - "@rollup/rollup-linux-s390x-gnu@npm:4.40.0": "e464366194da4d1a72fc5ecce6c59027004b878fc36114f2d7c25812da5fe1885c29eb14d7bb318a4bb3242a99e772f7713da22f7f2d93f4b6e6a3e012f3d1f4", - "@rollup/rollup-linux-x64-gnu@npm:4.40.0": "b472cd5acd066a60bd970865be1b229ca4c31a658a5c0277b6f441396243a20c535502a0ea7ea0dca6d12e2ccf53324b7e94c0d32a4f81f0b9866fd6cc3aff5a", - "@rollup/rollup-linux-x64-musl@npm:4.40.0": "f553ef17a801559ca9418eb57dd9621884bde4d0d9f01292d9bb84de271efbf4ba737ddaf78a710edd6138528f3d8e2b3d6ba1a969c9e34624ad4266bfba39db", - "@rollup/rollup-win32-arm64-msvc@npm:4.40.0": "f14da0ce3062084d81fd42432ddf6c3cd869b4c48dc1acd803bc151bc3b508dbd290d60624ab5507d691b9e53bec81a508b61688304f171088549067ec86445d", - "@rollup/rollup-win32-ia32-msvc@npm:4.40.0": "e6849d8cb8c276681f558b8212d58340488814e697486d9d125c1191479a4819387f681945f59c2b9fdd40020403cb72a099906960625da65d2114cf3df701e5", - "@rollup/rollup-win32-x64-msvc@npm:4.40.0": "347f3af8176858afaec0f4f0d7951d4cda81f77c30e8260c678a11809bcdee0542762f27f6a4194562c2a8a6321a774ea523216ed8cf105e041eff7498443f28", - "dmg-license@npm:1.0.11": "feef35cfb45270a72daadcca9584be5cb840f924448b9d4e543fcd61f1b6d471151049f277c91de1d8b003fad6203d0176066a5f427a01df5fb073402cb8c8b7", - "iconv-corefoundation@npm:1.1.7": "bc6f08ac421e5e92ed20f3825f123fd705e036612b2b6aa687958de753c06f32e54f0203ef55540869e3ee189eaea15e43a2757f3a90e555c4dd512c9422da43" + "@esbuild/aix-ppc64@npm:0.21.5": "1f48fea96ab4fbc2921756361bc8a0c4d0690f14dc2298a357aa3d436bcd1cd646d490e5d71c4e0fb46b9e04401bc93153d6886456dd0665b6758be643c95a16", + "@esbuild/aix-ppc64@npm:0.25.2": "e25252d47d27d5e15a09ba7e7e906fe35d90a363e1eec7bc1e054c066bea6f89364139385008f78e8b4523ebaecb1f7a678213c8fcc2cd0309d539bbc455fd05", + "@esbuild/android-arm64@npm:0.21.5": "7a4831b0886c165ed671f0094dcd491235fe503364a261379c84e2225a3c3230a06bce1d3a02316fa8a040b0ffede56c617746dc3b5550549ae3fb07095bb20d", + "@esbuild/android-arm64@npm:0.25.2": "b387ab30ec70902c81ca1231a7838ccc993ad8dff9561a5ec7d7d4e5f03426153d42e496985a02539bce55f6d1048156f36e24a29f61fa5fd8e0587f62696703", + "@esbuild/android-arm@npm:0.21.5": "9fa871018a9f2198f40fde2c672fcb1b9d3ab5ee602644ea4cf68c548ee2c0b6c60ad851ce85219f84886fd29757d8c49bac28ea48a2a16708a088e32dfe673a", + "@esbuild/android-arm@npm:0.25.2": "8e7efb22407ad9a985ff5a09dc0d2b895126c6ccca470db671ca0a3e3026f79666af20ce5d296311f5d056e95ca71e743feeae526f94dcaacb5a6969f9963283", + "@esbuild/android-x64@npm:0.21.5": "24e477ccdaf1437cabe8710bc052a13b975a53617094a225e39823a1c562a71ef975d860ab895c129a813302495d85387143e27068e62fc897a2ac0335e4a2f6", + "@esbuild/android-x64@npm:0.25.2": "66256eee6168c2f903c45c82863f1377f525dc7de0fc902fca412a44d0abbb8a25761fb9e10c8663b25b0f816d86b7e353d2b77ab39eae95234333f9d233ddc4", + "@esbuild/darwin-arm64@npm:0.21.5": "67b0e4ebc870d0babb6721328f02b0e75eca5ee8f176220fa194ac5897ce76a27aa4f6d724389a74e1517670f70e766fe03c30875fdebeee5b1f7b22e99c5a1f", + "@esbuild/darwin-arm64@npm:0.25.2": "36a568a779000133d077e2272181232f52939c3e0b0b986ad3f3fd6ab29628c148e88cd857f6de41a16e22e6a252bb16680f91c00c7d813690fa9bc060f58386", + "@esbuild/darwin-x64@npm:0.21.5": "a4b6df47edf4b1e91eeca9d7af18f538e25615e00763709a4cc24a8918e7ac93b9bfc2ef9f44086f16257d05ad99e23c1213a7a1397475d1a78f0a1e773af89a", + "@esbuild/darwin-x64@npm:0.25.2": "b761a20f8db7bf0499f6cba51c72104e733d9186d6f34a7f5e4590c02ecc2f9b84cd02c4e7bd3dade4156b7f92015cdbddc516dd1e4859233e3155cb0fecda58", + "@esbuild/freebsd-arm64@npm:0.21.5": "a4cf357807f2ea445b5191b8e5488070b567e2b534dba24ce6f8f1a332598ee0b9ffa41b3b0e55cd0cf57e2b56f0f1d84413faba182b81cb43bf19edf58a7654", + "@esbuild/freebsd-arm64@npm:0.25.2": "8f869d6200dba388ac4c008c7a5b6522f44797370a12f94fd19e37b6cd76bdbdf48d0fa893b5ce200a538a151281e9f71e985f82ec8b8c96f16075e45266c718", + "@esbuild/freebsd-x64@npm:0.21.5": "8957c1345196e5dabd7d9f290b5292161f5d9955f269051fa7873118cfb5a20c31d70771ea3560b513f879d0948ba32fba915fb1b387571c4fbbb1fbeaf2dd87", + "@esbuild/freebsd-x64@npm:0.25.2": "6cdfb6c6d6f6ead324a9ee75ab1068305672207cf1d3189bcf5599ec158e0eb07d74ff63597e389777163b4399da1cc6164b918a7ea9e798e7fd45eee6aad9bb", + "@esbuild/linux-arm64@npm:0.21.5": "1b95b17ed94eb977e38ea9130e677551b7cf0ccccdb3f23a9f8b59b5d67400817c2a417e4f043295bd3f67796853da2a1b1a8ca201ffe745efb40a144dfdc99c", + "@esbuild/linux-arm64@npm:0.25.2": "a0d51ec6e91e97461916eb6c25b12a8ea6b58ec2f3d91199c0c3f02ec569e98ff1389700250d4664d8394d3d5b5a051d695b34bfe77ab4a12985dfc18f315b73", + "@esbuild/linux-arm@npm:0.21.5": "6bfcd098ada5e6117d028777e5cc58456c2f570157fa0a0dce30c9d05b8389b86f74bf6b862534bf6994d342946c98b6774e1820880fd289765864b668e94c17", + "@esbuild/linux-arm@npm:0.25.2": "5a4cf4045a2a5949dc8875dbad9a82fde7333d3f59b66d8cb614b34b76a7fb715a8d74e41f0788104bcef0436108ca548d71a543f582073e0458e20370dbb802", + "@esbuild/linux-ia32@npm:0.21.5": "73c249c9918f0c9a9268ffe14fe745f5e7564b309dcea213da08a5e4367ffdfc8df4b004c70f80269dce0f653a3280cfdd8bf9a7a616b5b60649e4faea6e69b5", + "@esbuild/linux-ia32@npm:0.25.2": "535c1755ed95a47b05b865361d2efbef3490f05815743c0d2372f55a2e14f0cc1d5ed6e5dd6f91c7aea871ea2f64cea021eea6e714027148489c54edc6e2b19f", + "@esbuild/linux-loong64@npm:0.21.5": "60977efe24b3b6e1461d49da07dd57c1234992b9d2e6ac7d0dedfee538321d42be25e496ffb193121d3a6c6ca6ea6722b880e95695824dcc6643a3d9426b2296", + "@esbuild/linux-loong64@npm:0.25.2": "8ff82f5cdd7a9490dfb3be64c990841d2a8e1a0ce83d76fa8d5e9b0ba7aa91ca725f338ff43b4d69a18744905f1730adf87a7f8359ae839030663e0bbe2807e2", + "@esbuild/linux-mips64el@npm:0.21.5": "20fb6c8f6e58f66cd4351034858b2ad85bda4144576b180979305cfabed43780a71934e9f176e476c719f14e37253b231a43d46638ad232989d5f4dd72ec6b75", + "@esbuild/linux-mips64el@npm:0.25.2": "382520bf655329d04f65e041f9bf774d11a2232bdf5125934732db915c179b1172ec3429722d9f02f46ee5bad7b70372872bfd003d7c1cc5ec95b7ca6ec8a983", + "@esbuild/linux-ppc64@npm:0.21.5": "69f2ef1d127f48bc14cec479ae1a96dbf5fea651e0a3f148486f73495d2acb91acdaa164cd80648844916f05e7f9f9665a1864dd394e7f9acf96bea70937e6b5", + "@esbuild/linux-ppc64@npm:0.25.2": "c5736195867e9c441cabd0a2cbaa62f91c4e4963ed7490018d09a932d549e1d281411ddf9dbd4a4b68f0c0298c1321ba15fd4e493cdc3dea3e14b7a6207b12f8", + "@esbuild/linux-riscv64@npm:0.21.5": "60c749d87c0f67cc67c5cc0d82aa597b7a807bc52510a16960337433bdbc8fa9f3c46eba98080106c0971e404e2250ca11c441bb4ae5b7a7d78b4095e3a70363", + "@esbuild/linux-riscv64@npm:0.25.2": "c72879775daded232fb2e36a6fe26058ec1ccd1f5dd6a76b4e8da700c6dd20cb15b684bce34569cadd41f25a0a53bd2037994279856bb3148f8c16055adcaf68", + "@esbuild/linux-s390x@npm:0.21.5": "a14ff0484b962b374fd1e4662a53f8dd8999ba39fcf891f15631dfb2802c8d18893d6e366c42d28d55885e5804b7d6252c0e3cee038c241285c9b537ef12b4ae", + "@esbuild/linux-s390x@npm:0.25.2": "d8810561312c4c7705f3c580ef8cd38e2768feb19ebf2899595a227f59dfb6ca35182f8ad7ca65d503cc5d9c688fe742002243387aa09b98b8c32aabc522ac4e", + "@esbuild/linux-x64@npm:0.21.5": "9e5663fcace9c8456e9934a9ed6e7428db4080024eef3bfeaf82d476120bd881382c958be2785463d6b44467b3d3f870d6cce09a9cb37bcef19afeb97814d674", + "@esbuild/linux-x64@npm:0.25.2": "32c8a5f7d0640655ebf60f379ee2b037fe83f3f0edad911a9098505e6ac589c5f2873ff441017183626a19d334e3bb59f58411f2d5474eb7222917575593abea", + "@esbuild/netbsd-arm64@npm:0.25.2": "0b7f77ec46163feac839b17b94e7db87edf61441bd9a67115722bf72781021c8220576a2e2c70bbca45b89a1e69a6b132f5489b59e84241b197272c1ee080304", + "@esbuild/netbsd-x64@npm:0.21.5": "3cb6115c4557d653c7ad6d2be5b4ed7a688b14d85b7b7108a1a57dda0b2cca3f8ed13560fa6639da8788f860b75eb714a17cfb7ba8f967e93bdf40c9b3a1cde1", + "@esbuild/netbsd-x64@npm:0.25.2": "6d6686f5d2eb79b042bd4f38dc95e73a8e290a057be1b6afc42867830c9cf2313600b4fd53287f2f418c9f454bf5df02154b16dcfbfc33a6eb2ce9722a4eecc1", + "@esbuild/openbsd-arm64@npm:0.25.2": "8a08c16440c6389623bbacb717412635aff61a1552c917e707d71da1dc92c618eea9a9aa1606a4a4f322216f100ede658523baec2e82b1f11b4efd523d491173", + "@esbuild/openbsd-x64@npm:0.21.5": "1caf0b502d6e2612ffd3e62589de2b9cd48cd742818746011d437e2d5787df4984f7c17b7a536aa20f12d04e519c859d755a7b57e6db0ed277054bd9c1036e85", + "@esbuild/openbsd-x64@npm:0.25.2": "43baf3248bb460e169cb1b5f26f5eb720088fa0d467c77f4f72c6cfa8e6d7b7794c52ed5e4a9a2113db53313c5fec86e352c94939abf601ab22d5e6e9addc4e5", + "@esbuild/sunos-x64@npm:0.21.5": "676da7301c7c600bb7de2523ecf5d877128da3c125fd8136533f5be38ca15d9f800b2fbbd396ca37d44c5daa51b8124d8a4728bb18245cd2becb3191b897c45a", + "@esbuild/sunos-x64@npm:0.25.2": "0babbb99d3bc3ed818b2b01fbf65ebbf5930defb850e5a5a94a3ba5fc7bc2463d561c07af0d3ac6d6d0197c86682750ceb47abf7d293dd3222b1bd33da9f8aa5", + "@esbuild/win32-arm64@npm:0.21.5": "9b2ab87429efd3c2697dc5c7948ea57b57757b6e4709469e773b73cd5fe4b7fda5912073f4c3bdf9d0346b8f3ae443367a63bcd51de24fb81b9f592712eb3366", + "@esbuild/win32-arm64@npm:0.25.2": "205aab6fc7b0ca7ee992cd24d73550110c1f79dc2ca724384bb52aa95111248df022375cd648314bd7eeb42083d576c55572f3d39d4ddcd82fc7372f1e7688b0", + "@esbuild/win32-ia32@npm:0.21.5": "c1fe3276507d82202c464cd4809e67e6f151e29ed9de05c32d086dfe30207db15e646911ebc7f50df659891bfee292a25062792c589c2ff769be238c6b5fb8be", + "@esbuild/win32-ia32@npm:0.25.2": "aa38c0e082e3111e84929a64638cce1c3e1114218726e41c99bf239f2c05be94fb6fe1083366aa342bbd8e75fd449a6a3bcae9b6b3b84066a3a3882dcbaa0090", + "@esbuild/win32-x64@npm:0.21.5": "5d7b28baa9c22684d35ec0515f6d36f8f583f26733c8e84c7f78edf17b8a7d133819267486f2fd66f20ca3a810896f11c3c81106d745040c2f07ade314846bf1", + "@esbuild/win32-x64@npm:0.25.2": "2f2d147c610a3c3ab0f0f97132e4421464d3d38b835d989e8c324b7397e2592cd05485ec1998ae352f06d3191dd1d71c24f94f63f7c70cd8ea8a4c85441502a9", + "@libsql/darwin-arm64@npm:0.4.7": "161ac6b537e39e33c65a7f06c16152ccd5077129b8321b5d0082e008054c47dbc32563d39a47e223d09994457211582ff3760ffa5523f2dd3cfac1dd726a577a", + "@libsql/darwin-x64@npm:0.4.7": "45c85d00566507f19474f9ae4b6453fa8fff10994147751df2dd2177edf9961520af54156d2d41b23cdfaaf2b219ea4ebd4b44a868e890088fc2283c1224752b", + "@libsql/linux-arm64-gnu@npm:0.4.7": "c4126b0d717b45a8d1d66797bd7447fdaf53631277dac0250e0aa0267e279493b114b3823407e49da0e2928d6595d3a28370acb99c43424e8bc7e11434cae5f8", + "@libsql/linux-arm64-musl@npm:0.4.7": "13eef982caf2b73cebabde76b8e209ddea27d2ff0e6228a56704a50ad41975ff03a15d90bec6ccc908cb16355d685903719676f7a91c92d20a68eecff4a4f0b6", + "@libsql/linux-x64-gnu@npm:0.4.7": "524bf04f98f7a91e343b294262a627a965f626082b63b998c8019d105380caa2435e240f6085103751f87919ac2415aba97075696822915bf1a4e4492d9376f5", + "@libsql/linux-x64-musl@npm:0.4.7": "227cddb499cbbf677c1dfaeeb8bd787d4c6d4cbf50c94ac1632348f26b412d2f8bacdb0131050c507d1961f96f8bbff2d8b7949f26f1dcebb61e115da9253aa0", + "@libsql/win32-x64-msvc@npm:0.4.7": "2fcb8715b6f0571dec145eaaf3fd53c7c5aa5bf408fe1be9d84b10adc8a909bb6ee60b45e0d7052b0c1722c30ac212356a3f1adcdf7f57d5a59b48f36ca5bdf5", + "@parcel/watcher-android-arm64@npm:2.5.1": "f99d569e4f6cf78a1b0097fb9d4682cb201a74370ae440c531da4e1d5021e46141bfcdf8ef708b51a5b9cb1c30f78eea933ce75216d5eeb7b969a2ad27c68e4a", + "@parcel/watcher-darwin-arm64@npm:2.5.1": "973c7ef3c94608da9cd1b20b18b9a7de2fb46fe44553731fe372b640de524491976150d0845f3d5953b74ed8ea469cb8d18a48651d0e5fb82f549a6b46b54f79", + "@parcel/watcher-darwin-x64@npm:2.5.1": "848c5516aed9c36e14751200dbbf57e83c0bd46cdab0932df33db120e66b9596de18eeb98980e319efde84014f67d9e7924d7555383d8ffcefe35c501166b84b", + "@parcel/watcher-freebsd-x64@npm:2.5.1": "cbd2b7884bc92422edabc0c74c3fbc06512bb7300fc137aaff2e96f46f61e5272265a0b5d230acc82a0e777b0c11661f0b8b7f89a9342c0920b752436dd2c750", + "@parcel/watcher-linux-arm-glibc@npm:2.5.1": "f2e1ec14dbb0f85a84a75f55fd7721598694976ba3ad439832b57e558b0d9240cc80ff83053fb8cf7caffb0592d51bb39d325112763ec1734924b49d4ba9c144", + "@parcel/watcher-linux-arm-musl@npm:2.5.1": "83344c7ecda2e79db59d711bcee0c3fa26922989139c031bd762cf3d5bfb191797e22e9ed6072690b822dfd62629623ba4e7eedb3c41930a987fc3d4106000e1", + "@parcel/watcher-linux-arm64-glibc@npm:2.5.1": "562231feb159a294752378bebecc69a2d33366a9d877835844578799f8536398006e0e570849f9e2db04085a3ea82131459cd10fd6b42dea10cd73bd0c9ca13e", + "@parcel/watcher-linux-arm64-musl@npm:2.5.1": "f62db52a90ebbaa29ca9900e6b9bd3fc6e5c650741bbde9a2742cbc332c678b753fc6a596d67659394fd9262aa826463ea667d18cc554bcaaac9e8da1a2a29d0", + "@parcel/watcher-linux-x64-glibc@npm:2.5.1": "425e557991fde5092d6a9e20be71810600415e5fa157dca0b39bd8db86653d3ee7b037305261c8782d1a065f2a64d235e17b57876b26f5bb0dd7a9bdbe364690", + "@parcel/watcher-linux-x64-musl@npm:2.5.1": "4dbb066ba9478c8b8de39e3c1083cbb74f86f03eaf4445603e69909d6c072134644316faa20a2445419b9fe1a8063ade7b5331a5766d807ee0b15b8a70c59a2d", + "@parcel/watcher-win32-arm64@npm:2.5.1": "e015314d6b9b727cbe25eedf963ca8b23bf6d4e78d3c28008bd0d2657940ad54a271330486df3a93a5f1a30f2b8d052d14415b85cc7e7b747c6c73b5dc055628", + "@parcel/watcher-win32-ia32@npm:2.5.1": "920b6ad6a2095aeb9c2d329c5118472a3c14669fa93eaa99aa8050c76c5c2d3d76d92677167ed748c2ac5487c568d5df16d5d94f4bc7c354094fccd8e0d6350c", + "@parcel/watcher-win32-x64@npm:2.5.1": "8f1c8e41ec9f86e4dcd0d4db0a077742d5dcc853f15ea888387183e34e2efcff09fd1cc9ec46fc1121b9ad4ddc0e221283f2ffb23cfd7dbcbb8b03060b461963", + "@rollup/rollup-android-arm-eabi@npm:4.40.0": "723053f558eaeeb0a1fbf3b3063b930d3b1267a6aba211719927b0467f48513a514a05391689298a64624e98daa005e4685ef668787ebc228fd0527a5f17b419", + "@rollup/rollup-android-arm64@npm:4.40.0": "2562821c7032d2d95b891f47f02291d714d072fd91b3dbd07c528a7543f5e7d2458903cc38829feec311f1ebca6e34624262ae2e10aa32a0532b83c564db94cc", + "@rollup/rollup-darwin-arm64@npm:4.40.0": "cde6c2f4fe819131f65f5d19f8d1fd4889a4b8cc130cb30582fde72c79e388ef4644f57c7b03f453d4048043524ca067d5e2b4b505a5568840c73021fb74b572", + "@rollup/rollup-darwin-x64@npm:4.40.0": "28c269104ff10f0ab87a30c93139662780b0b6b4877a95cede7d66e833d478d1eb2f5aa275f60decb8383b2c05161f315902ad8fa1a52fa76283a05ceb32bf6b", + "@rollup/rollup-freebsd-arm64@npm:4.40.0": "27e99df8d1c5f0dfaead8fa6ce3025c5f959b4803e7683d95183761b1ecada4d877bd7f36465c424657ef650eac6199ddcf4911eda6367555633819454a5548d", + "@rollup/rollup-freebsd-x64@npm:4.40.0": "3422ce75f0fe774925763b1b63dded9aee56038d167af0b7f8ca0e468a8fae86d6a8aecd0b86a79718b8fc78c5ad987ba5b98be17b95fdcd48e4307749376e1b", + "@rollup/rollup-linux-arm-gnueabihf@npm:4.40.0": "b32cd2a73db75926722dfd42a6c5c6f2f1631f70a8d261317a0ce54e2c5dcee849c0a59cd85de0c0c7bbea9defb4f6649b1354871e6ac7f637cc22673d1486c1", + "@rollup/rollup-linux-arm-musleabihf@npm:4.40.0": "1c1d95fe81ee31d0d9cd75258865d35d2afccd8255b856c0da9a3c8afa012feb6b9557d1c234af8f4cc5dfd9d397564c650fe2e8769cb4407f626058c2e19d9c", + "@rollup/rollup-linux-arm64-gnu@npm:4.40.0": "a8d071163d135e992023a374660a72cc94af4d77a711e7720d4e3fc544a7af037add4839ef8d061503e5320ee80defd35b43a68cebad0105d16cfd870387934c", + "@rollup/rollup-linux-arm64-musl@npm:4.40.0": "5582761d9426caccee50beb1fdb06ebb16fba540eabde06e21d18f59667f7c6c99ca0c2743d1b9cdb54a3d0b28445befad52c76412632bf0d79f280022acc630", + "@rollup/rollup-linux-loongarch64-gnu@npm:4.40.0": "6d65384886c655b4a9190a2c8e3cd99d7049d13864be0f9b06c32a23ba1242bd09be0e9cba9425898a48b41bba52eb98223e34e3943924370a68f7c7800f66b2", + "@rollup/rollup-linux-powerpc64le-gnu@npm:4.40.0": "ebe38407efd0e45e92f939fe725e64695096c4389747b81f241e8a5d655526615e81512f3d61deae6aaf60669328a9bc93ac352351d6ccf8f1746caeb44bd7ab", + "@rollup/rollup-linux-riscv64-gnu@npm:4.40.0": "32cc2e2d03eadca60f42ba14af9723584c1ef7ee29f8a79578aacd9ce17e287d1f841aa926278d4b7cbf0f6d054c4ec045873a24c67279ca37f20e999f24bd4e", + "@rollup/rollup-linux-riscv64-musl@npm:4.40.0": "507c785bde98633f0139baccce0635047d43b19fb1d1fc770d4d88b11ef62b7885b0dac51a42c5f3e05bc0a56480928ae6304898884f0b5b0e56ad0cc98920f6", + "@rollup/rollup-linux-s390x-gnu@npm:4.40.0": "e464366194da4d1a72fc5ecce6c59027004b878fc36114f2d7c25812da5fe1885c29eb14d7bb318a4bb3242a99e772f7713da22f7f2d93f4b6e6a3e012f3d1f4", + "@rollup/rollup-linux-x64-gnu@npm:4.40.0": "b472cd5acd066a60bd970865be1b229ca4c31a658a5c0277b6f441396243a20c535502a0ea7ea0dca6d12e2ccf53324b7e94c0d32a4f81f0b9866fd6cc3aff5a", + "@rollup/rollup-linux-x64-musl@npm:4.40.0": "f553ef17a801559ca9418eb57dd9621884bde4d0d9f01292d9bb84de271efbf4ba737ddaf78a710edd6138528f3d8e2b3d6ba1a969c9e34624ad4266bfba39db", + "@rollup/rollup-win32-arm64-msvc@npm:4.40.0": "f14da0ce3062084d81fd42432ddf6c3cd869b4c48dc1acd803bc151bc3b508dbd290d60624ab5507d691b9e53bec81a508b61688304f171088549067ec86445d", + "@rollup/rollup-win32-ia32-msvc@npm:4.40.0": "e6849d8cb8c276681f558b8212d58340488814e697486d9d125c1191479a4819387f681945f59c2b9fdd40020403cb72a099906960625da65d2114cf3df701e5", + "@rollup/rollup-win32-x64-msvc@npm:4.40.0": "347f3af8176858afaec0f4f0d7951d4cda81f77c30e8260c678a11809bcdee0542762f27f6a4194562c2a8a6321a774ea523216ed8cf105e041eff7498443f28", + "@swc/core-darwin-arm64@npm:1.11.21": "6f228ce5497f8b797d9b838af6d51c8fc27d1643d13b033ed762ab5247047da91efa3e61f38040b5ff326bfb6af0ed663f5ec8319574db1c0e355d64c9c2b665", + "@swc/core-darwin-x64@npm:1.11.21": "8f7fcf910f17ab6d30fe55d7498f0ff2ac47e1e0fad749e01151891d5257f49c6354dae31917cc5097230940f9a068fcd981441e7c9581b1373e9e9c4d1ff9aa", + "@swc/core-linux-arm-gnueabihf@npm:1.11.21": "5f0d964b13b3c138fe0b3249b852db4330707d4584ed5d5b0b71fb72023e3b35f3faa88c6b8f49970f7adee57976e7e1fc9115be194b91f435249b6531602e1c", + "@swc/core-linux-arm64-gnu@npm:1.11.21": "203995730e55bfe640055a7adbb0c6b133c698aa018394d0338d00d311b10f874e46cdc0579585fb443505a3361b3da185436ad9fea553ecbed697a4f810ea7e", + "@swc/core-linux-arm64-musl@npm:1.11.21": "9618139c32eefd5acf184fc0c5e09986f170cec1069296a274c32b694a5a2129ae7aa21b8d016d5c186574929f05d456c6f4babdd0e528021dee4c51605da2d8", + "@swc/core-linux-x64-gnu@npm:1.11.21": "886a4f4a3ad6d0d3b437a250bf36b0395b34f4731381ce1cbbe43b05fb7ab4aa12a23c3f0e33bc4b2703ebcdad9a7e3fc18b7481a79e372ecc331c1e3eca1437", + "@swc/core-linux-x64-musl@npm:1.11.21": "069f33ba7b9376494f7345efed1c845e201857bbe5ba165ca8026760989344eaf0e5efbbc7f711a6c776385aa5ad383cee75543687c024854acb296c4e4752c1", + "@swc/core-win32-arm64-msvc@npm:1.11.21": "05ea5df6614075ec8487a91cb047a30aebeef3f142232a2feb0a475c85f2d64a876aef4183849f43480b9b5786afad7b3cb2bc1f53060d71ab6ff439a71317f3", + "@swc/core-win32-ia32-msvc@npm:1.11.21": "ad1ba754c36131238f2ac8ec51ffc4b987888b45b3008c0fbdd31d85d6fc039f8dd9c5d188c24cb72c4f4f345090a4dcfbcbfd840e954b7aeeb2974e0baf0e4a", + "@swc/core-win32-x64-msvc@npm:1.11.21": "0fb0c108c2e4a3bd82251f7552c9daa8c243829617bee7d954d1b0e021214184ead5c08dd108b3a5ac2d501797db794246a25867970ef2082f844f47b5b25070", + "dmg-license@npm:1.0.11": "feef35cfb45270a72daadcca9584be5cb840f924448b9d4e543fcd61f1b6d471151049f277c91de1d8b003fad6203d0176066a5f427a01df5fb073402cb8c8b7", + "iconv-corefoundation@npm:1.1.7": "bc6f08ac421e5e92ed20f3825f123fd705e036612b2b6aa687958de753c06f32e54f0203ef55540869e3ee189eaea15e43a2757f3a90e555c4dd512c9422da43" } diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix index 028fe525cb44..01bdf2c669a2 100644 --- a/pkgs/by-name/ch/cherry-studio/package.nix +++ b/pkgs/by-name/ch/cherry-studio/package.nix @@ -18,20 +18,30 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "cherry-studio"; - version = "1.2.7"; + version = "1.2.10"; src = fetchFromGitHub { owner = "CherryHQ"; repo = "cherry-studio"; tag = "v${finalAttrs.version}"; - hash = "sha256-Pxxv6f6YHjc1BAT93ASY2XUsB0CGVo4F/DcM7tReS9U="; + hash = "sha256-txzZbtA6Fvc/2cpD9YM5wwtZix+qjtW0B6aAV4I7Ce8="; }; + postPatch = '' + substituteInPlace src/main/services/ConfigManager.ts \ + --replace-fail "ConfigKeys.AutoUpdate, true" "ConfigKeys.AutoUpdate, false" \ + --replace-fail "ConfigKeys.AutoUpdate, value" "ConfigKeys.AutoUpdate, false" + substituteInPlace src/main/services/AppUpdater.ts \ + --replace-fail " = isActive" " = false" + substituteInPlace src/renderer/src/hooks/useSettings.ts \ + --replace-fail "isAutoUpdate)" "false)" + ''; + missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; - hash = "sha256-I5K0JEFOuk9ugLBz/TON8RxBx4MojMk8Ol9XRg0Rxi8="; + hash = "sha256-rKXUGfBL8upKU5MIe9fqHyEETNKsWdiUdsbHmvJPQdQ="; }; nativeBuildInputs = [ From 753d082a3c1c52d7470ea49133fa25865c0f85f0 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 1 May 2025 06:24:04 +0200 Subject: [PATCH 17/49] gcompris: fix absolute path --- pkgs/games/gcompris/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix index 60d87033272f..a393faabfdc8 100644 --- a/pkgs/games/gcompris/default.nix +++ b/pkgs/games/gcompris/default.nix @@ -27,6 +27,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-E3l+5l4rsauidl6Ik5gSWf+SGpVaAVi5X51etl1D05w="; }; + # fix concatenation of absolute paths like + # /nix/store/77zcv3vmndif01d4wh1rh0d1dyvyqzpy-gcompris-25.0/bin/..//nix/store/77zcv3vmndif01d4wh1rh0d1dyvyqzpy-gcompris-25.0/share/gcompris-qt/rcc/core.rcc + postPatch = '' + substituteInPlace src/core/config.h.in --replace-fail \ + "../@_data_dest_dir@" "../share/gcompris-qt" + ''; + cmakeFlags = [ (lib.cmakeFeature "QML_BOX2D_LIBRARY" "${qmlbox2d}/${qtbase.qtQmlPrefix}/Box2D.2.1") (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) From 707bc16ed8fc4ad5a5bcc8eb0c986e5f50e9b8ba Mon Sep 17 00:00:00 2001 From: emaryn Date: Fri, 2 May 2025 23:37:15 +0800 Subject: [PATCH 18/49] ibmcloud-cli: 2.30.0 -> 2.34.0 --- pkgs/tools/admin/ibmcloud-cli/default.nix | 39 +++++++++++++---------- pkgs/tools/admin/ibmcloud-cli/update.sh | 29 +++++++++++++++++ 2 files changed, 51 insertions(+), 17 deletions(-) create mode 100755 pkgs/tools/admin/ibmcloud-cli/update.sh diff --git a/pkgs/tools/admin/ibmcloud-cli/default.nix b/pkgs/tools/admin/ibmcloud-cli/default.nix index 1c99a48b0203..6aec2f7538dc 100644 --- a/pkgs/tools/admin/ibmcloud-cli/default.nix +++ b/pkgs/tools/admin/ibmcloud-cli/default.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, installShellFiles, + writableTmpDirAsHomeHook, }: let arch = @@ -29,50 +30,54 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ibmcloud-cli"; - version = "2.30.0"; + version = "2.34.0"; src = fetchurl { url = "https://download.clis.cloud.ibm.com/ibm-cloud-cli/${finalAttrs.version}/binaries/IBM_Cloud_CLI_${finalAttrs.version}_${platform}.tgz"; - sha256 = + hash = { - "x86_64-darwin" = "5d4d16f35c034aa336e28b5685684146ec5773a6d7f456ed0d0e5d686adf4b25"; - "aarch64-darwin" = "d563b8a4214da4360756bd18283b68c118139b5d3dd1b1d31c7ab7e61349e126"; - "x86_64-linux" = "e6c874702851f16a3c21570020da85122a0ec0ca7e9dd75091684df1030d7295"; - "aarch64-linux" = "6904c9de54845adcd08eb9906567493b68ad3f4cbba9d1121f63d9df2dd47185"; - "i686-linux" = "bc6be9a65a6942e158ab202a2d1c89c4294b5cebf60841f4ac1d21064052e7e7"; - "powerpc64le-linux" = "271a0aa9c0a1dc2c84772fba33c9c6b97588d35eccf6757de6974c433b6e7874"; - "s390x-linux" = "e8ec8adaaae2eab091500c257c7b18acf5e9556b4910df8290600bd7f723fdc1"; + "x86_64-darwin" = "sha256-6E+yUqpX8kp/T4jxAWwkBUsCQh31vwJGw3wnqkUs3Js="; + "aarch64-darwin" = "sha256-CK0fUIYDVx25EzXGdhexaChVxkifSn6BKtZTQB5wl1o="; + "x86_64-linux" = "sha256-xYuVEkgbVQNdR/v9C0Do9wMeOYlfntRJaen/XaHMJvQ="; + "aarch64-linux" = "sha256-MXr6NpO3XhrCbcss3Y+GzkbgQ07iOzmp99lAtfZ8YMk="; + "i686-linux" = "sha256-1oL+jn3KTfIE+2oW4i8+RUr/c9/Ew/H7PToe/l19C5s="; + "powerpc64le-linux" = "sha256-hZADXpi9zxRB+wy4V4owQqmE3BYRSenNjlUfjWqBnow="; + "s390x-linux" = "sha256-ayQZD4+6U6WLfIhbVy/HCATjhZYybk3/83ak7BruWQ8="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + writableTmpDirAsHomeHook + ]; installPhase = '' runHook preInstall - install -D ibmcloud $out/bin/ibmcloud + install -Dm755 ibmcloud $out/bin/ibmcloud mkdir -p $out/share/ibmcloud cp LICENSE NOTICE $out/share/ibmcloud - export HOME=$(mktemp -d) installShellCompletion --cmd ibmcloud --bash <($out/bin/ibmcloud --generate-bash-completion) runHook postInstall ''; - meta = with lib; { + passthru.updateScript = ./update.sh; + + meta = { description = "Command line client for IBM Cloud"; homepage = "https://cloud.ibm.com/docs/cli"; - license = licenses.asl20; - maintainers = with maintainers; [ emilytrau ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ emilytrau ]; platforms = [ "x86_64-linux" "aarch64-linux" "i686-linux" "powerpc64le-linux" "s390x-linux" - ] ++ platforms.darwin; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + ] ++ lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; mainProgram = "ibmcloud"; }; }) diff --git a/pkgs/tools/admin/ibmcloud-cli/update.sh b/pkgs/tools/admin/ibmcloud-cli/update.sh new file mode 100755 index 000000000000..c2b80cb104f2 --- /dev/null +++ b/pkgs/tools/admin/ibmcloud-cli/update.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash nix-update common-updater-scripts nix jq + +set -euo pipefail + +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; ibmcloud-cli.version or (lib.getVersion ibmcloud-cli)" | tr -d '"') +latestVersion=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/IBM-Cloud/ibm-cloud-cli-release/releases/latest | jq --raw-output .tag_name | sed 's/^v//') + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "package is up-to-date: $currentVersion" + exit 0 +fi + +update-source-version ibmcloud-cli $latestVersion || true + +for system in \ + x86_64-linux \ + aarch64-linux \ + i686-linux \ + powerpc64le-linux \ + s390x-linux \ + x86_64-darwin \ + aarch64-darwin; do + tmp=$(mktemp -d) + curl -fsSL -o $tmp/ibmcloud-cli $(nix-instantiate --eval -E "with import ./. {}; ibmcloud-cli.src.url" --system "$system" | tr -d '"') + hash=$(nix hash file $tmp/ibmcloud-cli) + update-source-version ibmcloud-cli $latestVersion $hash --system=$system --ignore-same-version + rm -rf $tmp +done From f3d5ea1aa1e104e44d204540b97beba3347ac88f Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 2 May 2025 17:48:50 +0200 Subject: [PATCH 19/49] pulsar: 1.127.1 -> 1.128.0 Changelog: https://github.com/pulsar-edit/pulsar/blob/v1.128.0/CHANGELOG.md --- pkgs/by-name/pu/pulsar/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pu/pulsar/package.nix b/pkgs/by-name/pu/pulsar/package.nix index 9bb1a49a7c60..3b5f7645d154 100644 --- a/pkgs/by-name/pu/pulsar/package.nix +++ b/pkgs/by-name/pu/pulsar/package.nix @@ -36,14 +36,14 @@ let pname = "pulsar"; - version = "1.127.1"; + version = "1.128.0"; sourcesPath = { x86_64-linux.tarname = "Linux.${pname}-${version}.tar.gz"; - x86_64-linux.hash = "sha256-qcsnYrfrKD9QKcV2eEYVcHNKxpGUtC9G2D3G/ceuWCw="; + x86_64-linux.hash = "sha256-LDr5H2VchlTzHtwcDo0za9GWfKZTpXx6LZVwtgKWxxY="; aarch64-linux.tarname = "ARM.Linux.${pname}-${version}-arm64.tar.gz"; - aarch64-linux.hash = "sha256-V40O0M6H7sveuYpHB9vdatUR+r7q0YKTI4XcGOQXffo="; + aarch64-linux.hash = "sha256-tT55J2TDRiEcsh5vNVl2dapRdYj3yZsn0ZrfjO5qnqE="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); From 92a76e7c3b34fa486e8cef24adc94084c93d7d5d Mon Sep 17 00:00:00 2001 From: emaryn Date: Fri, 2 May 2025 22:44:06 +0800 Subject: [PATCH 20/49] input-remapper: 2.0.1 -> 2.1.1 Diff: https://github.com/sezanzeb/input-remapper/compare/2.0.1...2.1.1 --- .../inputmethods/input-remapper/default.nix | 114 ++++++++++-------- 1 file changed, 61 insertions(+), 53 deletions(-) diff --git a/pkgs/tools/inputmethods/input-remapper/default.nix b/pkgs/tools/inputmethods/input-remapper/default.nix index 4713d7f2f4c0..583fc35dc430 100644 --- a/pkgs/tools/inputmethods/input-remapper/default.nix +++ b/pkgs/tools/inputmethods/input-remapper/default.nix @@ -1,5 +1,7 @@ { lib, + buildPythonApplication, + fetchFromGitHub, pkgconfig, wrapGAppsHook3, gettext, @@ -14,10 +16,9 @@ pydantic, pydbus, psutil, - fetchFromGitHub, - buildPythonApplication, procps, gtksourceview4, + bash, nixosTests, # Change the default log level to debug for easier debugging of package issues withDebugLogLevel ? false, @@ -36,40 +37,84 @@ let in (buildPythonApplication rec { pname = "input-remapper"; - version = "2.0.1"; + version = "2.1.1"; src = fetchFromGitHub { owner = "sezanzeb"; repo = "input-remapper"; - rev = version; - hash = "sha256-rwlVGF/cWSv6Bsvhrs6nMDQ8avYT80aasrhWyQv55/A="; + tag = version; + hash = "sha256-GMKcs2UK1yegGT/TBsLGgTBJROQ38M6WwnLbJIuAZwg="; }; postPatch = '' # fix FHS paths substituteInPlace inputremapper/configs/data.py \ - --replace "/usr/share" "$out/usr/share" + --replace-fail "/usr/share" "$out/usr/share" '' + lib.optionalString withDebugLogLevel '' # if debugging - substituteInPlace inputremapper/logger.py --replace "logger.setLevel(logging.INFO)" "logger.setLevel(logging.DEBUG)" + substituteInPlace inputremapper/logger.py \ + --replace-fail "logger.setLevel(logging.INFO)" "logger.setLevel(logging.DEBUG)" ''; - doCheck = withDoCheck; - nativeCheckInputs = [ + nativeBuildInputs = [ + wrapGAppsHook3 + gettext # needed to build translations + gtk3 + glib + gobject-introspection + pygobject3 + ] ++ maybeXmodmap; + + dependencies = [ + setuptools # needs pkg_resources + pygobject3 + evdev + pkgconfig + pydantic + pydbus + gtksourceview4 psutil ]; + + doCheck = withDoCheck; + + nativeCheckInputs = [ psutil ]; + pythonImportsCheck = [ "evdev" "inputremapper" ]; + postInstall = '' + substituteInPlace data/99-input-remapper.rules \ + --replace-fail 'RUN+="/bin/input-remapper-control' "RUN+=\"$out/bin/input-remapper-control" + substituteInPlace data/input-remapper.service \ + --replace-fail "ExecStart=/usr/bin/input-remapper-service" "ExecStart=$out/bin/input-remapper-service" + substituteInPlace data/input-remapper-autoload.desktop \ + --replace-fail "bash" "${lib.getExe bash}" + + install -m644 -D -t $out/share/applications/ data/*.desktop + install -m644 -D -t $out/share/polkit-1/actions/ data/input-remapper.policy + install -m644 -D data/99-input-remapper.rules $out/etc/udev/rules.d/99-input-remapper.rules + install -m644 -D data/input-remapper.service $out/lib/systemd/system/input-remapper.service + install -m644 -D data/input-remapper.policy $out/share/polkit-1/actions/input-remapper.policy + install -m644 -D data/inputremapper.Control.conf $out/etc/dbus-1/system.d/inputremapper.Control.conf + install -m644 -D data/input-remapper.svg $out/share/icons/hicolor/scalable/apps/input-remapper.svg + install -m644 -D -t $out/usr/share/input-remapper/ data/* + + # Only install input-remapper prefixed binaries, we don't care about deprecated key-mapper ones + install -m755 -D -t $out/bin/ bin/input-remapper* + ''; + # Custom test script, can't use plain pytest / pytestCheckHook # We only run tests in the unit folder, integration tests require UI # To allow tests which access the system and session DBUS to run, we start a dbus session # and bind it to both the system and session buses installCheckPhase = '' + runHook preInstallCheck + echo " session unix:tmpdir=$TMPDIR @@ -97,10 +142,13 @@ in DBUS_SYSTEM_BUS_ADDRESS=unix:path=/build/system_bus_socket \ ${dbus}/bin/dbus-run-session --config-file dbus.cfg \ python tests/test.py --start-dir unit + + runHook postInstallCheck ''; # Nixpkgs 15.9.4.3. When using wrapGAppsHook3 with special derivers you can end up with double wrapped binaries. dontWrapGApps = true; + preFixup = '' makeWrapperArgs+=( "''${gappsWrapperArgs[@]}" @@ -108,54 +156,14 @@ in ) ''; - nativeBuildInputs = [ - wrapGAppsHook3 - gettext # needed to build translations - gtk3 - glib - gobject-introspection - pygobject3 - ] ++ maybeXmodmap; - - propagatedBuildInputs = [ - setuptools # needs pkg_resources - pygobject3 - evdev - pkgconfig - pydantic - pydbus - gtksourceview4 - ]; - - postInstall = '' - substituteInPlace data/99-input-remapper.rules \ - --replace-fail 'RUN+="/bin/input-remapper-control' "RUN+=\"$out/bin/input-remapper-control" - substituteInPlace data/input-remapper.service \ - --replace-fail 'ExecStart=/usr/bin/input-remapper-service' "ExecStart=$out/bin/input-remapper-service" - substituteInPlace data/input-remapper-*.desktop \ - --replace-fail 'Icon=/usr/share/input-remapper/input-remapper.svg' 'Icon=input-remapper.svg' - - install -m644 -D -t $out/share/applications/ data/*.desktop - install -m644 -D -t $out/share/polkit-1/actions/ data/input-remapper.policy - install -m644 -D data/99-input-remapper.rules $out/etc/udev/rules.d/99-input-remapper.rules - install -m644 -D data/input-remapper.service $out/lib/systemd/system/input-remapper.service - install -m644 -D data/input-remapper.policy $out/share/polkit-1/actions/input-remapper.policy - install -m644 -D data/inputremapper.Control.conf $out/etc/dbus-1/system.d/inputremapper.Control.conf - install -m644 -D data/input-remapper.svg $out/share/icons/hicolor/scalable/apps/input-remapper.svg - install -m644 -D -t $out/usr/share/input-remapper/ data/* - - # Only install input-remapper prefixed binaries, we don't care about deprecated key-mapper ones - install -m755 -D -t $out/bin/ bin/input-remapper* - ''; - passthru.tests = nixosTests.input-remapper; - meta = with lib; { + meta = { description = "Easy to use tool to change the mapping of your input device buttons"; homepage = "https://github.com/sezanzeb/input-remapper"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ LunNova ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ LunNova ]; mainProgram = "input-remapper-gtk"; }; }).overrideAttrs From 7d05058ea2fa9e66b82b961e1b5c67bc4ae7165a Mon Sep 17 00:00:00 2001 From: emaryn Date: Sat, 3 May 2025 06:28:15 +0800 Subject: [PATCH 21/49] jet-pilot: 1.31.1 -> 1.35.0 Diff: https://github.com/unxsist/jet-pilot/compare/v1.31.1...v1.35.0 Changelog: https://github.com/unxsist/jet-pilot/releases --- pkgs/by-name/je/jet-pilot/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/je/jet-pilot/package.nix b/pkgs/by-name/je/jet-pilot/package.nix index 2798f4aed6c9..fd467b654bf5 100644 --- a/pkgs/by-name/je/jet-pilot/package.nix +++ b/pkgs/by-name/je/jet-pilot/package.nix @@ -6,11 +6,11 @@ appimageTools.wrapType2 rec { pname = "jet-pilot"; - version = "1.31.1"; + version = "1.35.0"; src = fetchurl { - url = "https://github.com/unxsist/jet-pilot/releases/download/v${version}/jet-pilot_${version}_amd64.AppImage"; - hash = "sha256-FKrqWhFX6we+NRIO7wcqkjlDj7oy0zrIhAXTOAoYxNw="; + url = "https://github.com/unxsist/jet-pilot/releases/download/v${version}/JET.Pilot_${version}_amd64.AppImage"; + hash = "sha256-W1VRV29ZV8nD3wAcSNAsWguN8s+zio0lsVaZwAnCOwE="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From 29b4b7963ee63b47711af618ee29ca4cb4177b78 Mon Sep 17 00:00:00 2001 From: emaryn Date: Sat, 3 May 2025 06:34:22 +0800 Subject: [PATCH 22/49] jp2a: 1.2.0 -> 1.3.2 Diff: https://github.com/Talinx/jp2a/compare/v1.2.0...v1.3.2 --- pkgs/by-name/jp/jp2a/package.nix | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/jp/jp2a/package.nix b/pkgs/by-name/jp/jp2a/package.nix index 7c004b5d5eb4..10ff29d72b96 100644 --- a/pkgs/by-name/jp/jp2a/package.nix +++ b/pkgs/by-name/jp/jp2a/package.nix @@ -9,17 +9,19 @@ autoconf-archive, pkg-config, bash-completion, + libwebp, + libexif, }: -stdenv.mkDerivation rec { - version = "1.2.0"; +stdenv.mkDerivation (finalAttrs: { + version = "1.3.2"; pname = "jp2a"; src = fetchFromGitHub { owner = "Talinx"; repo = "jp2a"; - rev = "v${version}"; - sha256 = "sha256-TyXEaHemKfCMyGwK6P2vVL9gPWRLbkaNP0g+/UYGSVc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-GcwwzVgF7BK2N8TL8z/7R7Ry1e9pmGiXUrOAQQmPIBo="; }; makeFlags = [ "PREFIX=$(out)" ]; @@ -30,21 +32,24 @@ stdenv.mkDerivation rec { pkg-config bash-completion ]; + buildInputs = [ libjpeg libpng ncurses + libwebp + libexif ]; installFlags = [ "bashcompdir=\${out}/share/bash-completion/completions" ]; - meta = with lib; { + meta = { broken = stdenv.hostPlatform.isDarwin; homepage = "https://csl.name/jp2a/"; description = "Small utility that converts JPG images to ASCII"; - license = licenses.gpl2Only; - maintainers = [ maintainers.FlorianFranzen ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.FlorianFranzen ]; + platforms = lib.platforms.unix; mainProgram = "jp2a"; }; -} +}) From 2d13c1de801fa83e90fea196ecd86189cee86b1b Mon Sep 17 00:00:00 2001 From: emaryn Date: Sat, 3 May 2025 08:56:31 +0800 Subject: [PATCH 23/49] krop: 0.6.0 -> 0.7.0 Diff: https://github.com/arminstraub/krop/compare/v0.6.0...v0.7.0 --- pkgs/by-name/kr/krop/package.nix | 50 +++++++++----------------------- 1 file changed, 13 insertions(+), 37 deletions(-) diff --git a/pkgs/by-name/kr/krop/package.nix b/pkgs/by-name/kr/krop/package.nix index 889cd4317e04..6fece014dffa 100644 --- a/pkgs/by-name/kr/krop/package.nix +++ b/pkgs/by-name/kr/krop/package.nix @@ -1,62 +1,38 @@ { lib, + python3Packages, fetchFromGitHub, - python3, libsForQt5, ghostscript, - qt5, - fetchPypi, }: -let - py = python3.override { - self = py; - packageOverrides = self: super: { - # Can be removed once this is merged - # https://github.com/arminstraub/krop/pull/40 - pypdf2 = super.pypdf2.overridePythonAttrs (oldAttrs: rec { - version = "2.12.1"; - src = fetchPypi { - pname = "PyPDF2"; - inherit version; - hash = "sha256-4D7xirzHXadBoKzBp3SSU0loh744zZiHvM4c7jk9pF4="; - }; - }); - }; - }; -in - -py.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "krop"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "arminstraub"; - repo = pname; - rev = "v${version}"; - sha256 = "1ygzc7vlwszqmsd3v1dsqp1dpsn6inx7g8gck63alvf88dbn8m3s"; + repo = "krop"; + tag = "v${version}"; + hash = "sha256-8mhTUP0oS+AnZXVmywxBTbR1OOg18U0RQ1H9lyjaiVI="; }; - propagatedBuildInputs = with py.pkgs; [ - pyqt5 - pypdf2 - poppler-qt5 - ghostscript - ]; + nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ]; buildInputs = [ libsForQt5.poppler libsForQt5.qtwayland ]; - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + dependencies = with python3Packages; [ + pyqt5 + pypdf2 + poppler-qt5 + ghostscript + ]; makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ]; - postInstall = '' - install -m666 -Dt $out/share/applications krop.desktop - ''; - # Disable checks because of interference with older Qt versions // xcb doCheck = false; From b0fbef3d1b001c665c5300a16caae6af09ce2f64 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Fri, 2 May 2025 21:20:43 -0600 Subject: [PATCH 24/49] liborbispkg-pkgtool: init at 0.3-unstable-2024-10-12 --- .../li/liborbispkg-pkgtool/package.nix | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/by-name/li/liborbispkg-pkgtool/package.nix diff --git a/pkgs/by-name/li/liborbispkg-pkgtool/package.nix b/pkgs/by-name/li/liborbispkg-pkgtool/package.nix new file mode 100644 index 000000000000..c901746957bc --- /dev/null +++ b/pkgs/by-name/li/liborbispkg-pkgtool/package.nix @@ -0,0 +1,30 @@ +{ + lib, + buildDotnetModule, + fetchFromGitHub, +}: +buildDotnetModule { + pname = "liborbispkg-pkgtool"; + version = "0.3-unstable-2024-10-12"; + + src = fetchFromGitHub { + owner = "OpenOrbis"; + repo = "LibOrbisPkg"; + rev = "75616a28de0f49f05eeff872211e806fb6de3818"; + hash = "sha256-ySlMzUfJ0IXi/NWbj53jqCRDNm9Xh4TuffyKhNh4wuM="; + }; + + projectFile = "PkgTool.Core/PkgTool.Core.csproj"; + + postFixup = '' + mv $out/bin/PkgTool.Core $out/bin/pkgtool + ''; + + meta = { + description = "Library, GUI, CLI for creating, inspecting, and modifying PS4 PKG, SFO, PFS, and related filetypes"; + homepage = "https://github.com/OpenOrbis/LibOrbisPkg"; + license = lib.licenses.lgpl3Plus; + maintainers = [ lib.maintainers.ryand56 ]; + mainProgram = "pkgtool"; + }; +} From ffaeda65ac686d34ac0fb8ba49ef3f5c2a108e45 Mon Sep 17 00:00:00 2001 From: emaryn Date: Sat, 3 May 2025 15:17:49 +0800 Subject: [PATCH 25/49] flclash: 0.8.83 -> 0.8.84 --- pkgs/by-name/fl/flclash/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flclash/package.nix b/pkgs/by-name/fl/flclash/package.nix index e2775f492f80..d0c3b0a0fbc4 100644 --- a/pkgs/by-name/fl/flclash/package.nix +++ b/pkgs/by-name/fl/flclash/package.nix @@ -12,14 +12,14 @@ let pname = "flclash"; - version = "0.8.83"; + version = "0.8.84"; src = (fetchFromGitHub { owner = "chen08209"; repo = "FlClash"; tag = "v${version}"; - hash = "sha256-vkek2pHeXiIQ8pv5t8mRJDvqojhYW5cTUeKWN/mhGu8="; + hash = "sha256-XrZay7C8XIqwAATwDd8U+sh0BcNN5ap43ibYVs6qXFg="; fetchSubmodules = true; }).overrideAttrs (_: { @@ -41,7 +41,7 @@ let modRoot = "core"; - vendorHash = "sha256-YrJtvkDpSQnx5AE+3zjCim8lrTjARzJvz6nCkKVOCew="; + vendorHash = "sha256-Wm1VheSLaAS+tLQq7lNkPzoEER1sKiNczUgYLSfuLng="; env.CGO_ENABLED = 0; From 70c1259f96f89eeb8b265171068687acb44c08ae Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Mon, 21 Apr 2025 15:22:20 -0500 Subject: [PATCH 26/49] python3Packages.mocket: disable test_httprettish_httpx_session on darwin --- .../python-modules/mocket/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index ac41c1598853..f4f048060795 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + stdenv, fetchPypi, # build-system @@ -78,15 +79,20 @@ buildPythonPackage rec { _darwinAllowLocalNetworking = true; - disabledTests = [ - # tests that require network access (like DNS lookups) - "test_truesendall_with_dump_from_recording" - "test_aiohttp" - "test_asyncio_record_replay" - "test_gethostbyname" - # httpx read failure - "test_no_dangling_fds" - ]; + disabledTests = + [ + # tests that require network access (like DNS lookups) + "test_truesendall_with_dump_from_recording" + "test_aiohttp" + "test_asyncio_record_replay" + "test_gethostbyname" + # httpx read failure + "test_no_dangling_fds" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # fails on darwin due to upstream bug: https://github.com/mindflayer/python-mocket/issues/287 + "test_httprettish_httpx_session" + ]; pythonImportsCheck = [ "mocket" ]; From d83f0da9277bd56ae45059001393554bd1917aba Mon Sep 17 00:00:00 2001 From: patka Date: Sat, 3 May 2025 16:57:01 +0200 Subject: [PATCH 27/49] prusa-slicer: remove unused pcre dependency There is no mention of pcre in the upstream repo, nor does it appear anywhere when building while removed. It is unused --- pkgs/applications/misc/prusa-slicer/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index da47982cf58b..50dad04f82f1 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -28,7 +28,6 @@ nlopt, opencascade-occt_7_6_1, openvdb, - pcre, qhull, tbb_2021_11, wxGTK32, @@ -130,7 +129,6 @@ stdenv.mkDerivation (finalAttrs: { nlopt opencascade-override' openvdb_tbb_2021_8 - pcre qhull tbb_2021_11 wxGTK-override' From 4891277cdc5afac941d3e8db3fca27c5559d580d Mon Sep 17 00:00:00 2001 From: emaryn Date: Sat, 3 May 2025 23:50:45 +0800 Subject: [PATCH 28/49] bitcomet: 2.13.1 -> 2.13.2 --- pkgs/by-name/bi/bitcomet/package.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/bi/bitcomet/package.nix b/pkgs/by-name/bi/bitcomet/package.nix index ecbbb057b8bd..32b6cda4b3c1 100644 --- a/pkgs/by-name/bi/bitcomet/package.nix +++ b/pkgs/by-name/bi/bitcomet/package.nix @@ -2,16 +2,15 @@ lib, appimageTools, fetchurl, - webkitgtk_4_1, }: let pname = "bitcomet"; - version = "2.13.1"; + version = "2.13.2"; src = fetchurl { url = "https://download.bitcomet.com/linux/x86_64/BitComet-${version}-x86_64.AppImage"; - hash = "sha256-s8kCsPKr5XoS/Y6KzuiQV9ARq2UIo2PPKRinvik0aRo="; + hash = "sha256-T66hmWmjt7ZZj03IxTSYtNUBoFHgwOoAIOHMyJSAmbU="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; @@ -23,19 +22,19 @@ appimageTools.wrapType2 { pkgs: with pkgs; [ libxml2 libpng - webkitgtk_4_1 + webkitgtk_4_0 ]; extraInstallCommands = '' install -Dm644 ${appimageContents}/com.bitcomet.linux.desktop $out/share/applications/bitcomet.desktop substituteInPlace $out/share/applications/bitcomet.desktop \ - --replace-fail 'Exec=usr/bin/BitComet' 'Exec=bitcomet' + --replace-fail "Exec=usr/bin/BitComet" "Exec=bitcomet" cp -r ${appimageContents}/usr/share/icons $out/share/icons ''; meta = { homepage = "https://www.bitcomet.com"; - description = "Free BitTorrent download client"; + description = "BitTorrent download client"; mainProgram = "bitcomet"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; From e8fa99aa819ae250747d40c524c8f1fad2e17f16 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 3 May 2025 16:17:08 +0000 Subject: [PATCH 29/49] python3Packages.lottie: 0.7.1 -> 0.7.2 --- pkgs/development/python-modules/lottie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lottie/default.nix b/pkgs/development/python-modules/lottie/default.nix index 91f375d664e3..5edfc4058d2c 100644 --- a/pkgs/development/python-modules/lottie/default.nix +++ b/pkgs/development/python-modules/lottie/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { pname = "lottie"; - version = "0.7.1"; + version = "0.7.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-If05yOaLsfBDvVxmnDxgxwqc3lkCjTW8YV3e+S9CU2o="; + hash = "sha256-hTBKwVLNBCyf6YpSe10TajHG/iqs2FnOHFgYm7lG0Sc="; }; build-system = [ setuptools ]; From df11274a694f89df967afecbc5e0e0fd819e7e3e Mon Sep 17 00:00:00 2001 From: patka Date: Sat, 3 May 2025 18:52:31 +0200 Subject: [PATCH 30/49] radiotray-ng: remove unused pcre dependency There is no mention of pcre in the entire history of the upstream repo, nor does it appear anywhere when building while removed. It is unused --- pkgs/applications/audio/radiotray-ng/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 439fa8e4a0dd..adaf0fc898fb 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -11,7 +11,6 @@ boost, jsoncpp, libbsd, - pcre, # GUI/Desktop dbus, glibmm, @@ -74,7 +73,6 @@ stdenv.mkDerivation rec { boost jsoncpp libbsd - pcre glibmm hicolor-icon-theme gsettings-desktop-schemas From 57f21339369fe9f6cc4413aabd7d32506e998749 Mon Sep 17 00:00:00 2001 From: teto <886074+teto@users.noreply.github.com> Date: Sat, 3 May 2025 19:08:17 +0200 Subject: [PATCH 31/49] pymupdf: remove teto from maintainers This has become a popular package and several more active/better maintainers have come up to fix it everytime. This lets them have control. --- pkgs/development/python-modules/pymupdf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index 027c4ebe55e4..8db2acf59a3c 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -146,7 +146,7 @@ buildPythonPackage rec { homepage = "https://github.com/pymupdf/PyMuPDF"; changelog = "https://github.com/pymupdf/PyMuPDF/releases/tag/${src.tag}"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ teto ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } From e395aef9ad06ea8b7d227f36300bd5744314d2bf Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Fri, 2 May 2025 11:22:45 -0700 Subject: [PATCH 32/49] python3Packages.pycyphal: fixes --- .../python-modules/pycyphal/default.nix | 36 +++++++++++++------ 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pycyphal/default.nix b/pkgs/development/python-modules/pycyphal/default.nix index c587497eea13..38ee9a244b6d 100644 --- a/pkgs/development/python-modules/pycyphal/default.nix +++ b/pkgs/development/python-modules/pycyphal/default.nix @@ -2,23 +2,29 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, - python-can, + + # build system + setuptools, + + # dependencies + numpy, + nunavut, + + # optional dependencies cobs, libpcap, - nunavut, - numpy, pyserial, - pytestCheckHook, + python-can, + + # tests pytest-asyncio, + pytestCheckHook, }: buildPythonPackage rec { pname = "pycyphal"; version = "1.18.0"; - format = "setuptools"; - - disabled = pythonOlder "3.8"; + pyproject = true; src = fetchFromGitHub { owner = "OpenCyphal"; @@ -28,7 +34,11 @@ buildPythonPackage rec { fetchSubmodules = true; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + pythonRelaxDeps = [ "numpy" ]; + + dependencies = [ numpy nunavut ]; @@ -67,13 +77,17 @@ buildPythonPackage rec { disabledTestPaths = [ "pycyphal/application/__init__.py" "pycyphal/application/_transport_factory.py" - "pycyphal/transport/udp/_ip/_link_layer.py" - "pycyphal/transport/udp/_ip/_v4.py" + "pycyphal/application/register/backend/dynamic.py" + "pycyphal/application/register/backend/static.py" + "pycyphal/transport/udp" "tests/application" "tests/demo" "tests/dsdl" "tests/presentation" "tests/transport" + # These are flaky -- test against string representations of values + "pycyphal/application/register/_registry.py" + "pycyphal/application/register/_value.py" ]; pythonImportsCheck = [ "pycyphal" ]; From 748c0e4f9c754c6fcdf18afe3bfa60f4e3072317 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 3 May 2025 19:32:14 +0100 Subject: [PATCH 33/49] nanosaur: add missing `libGL` depend Without the change the build fails as https://hydra.nixos.org/build/294807086: CMake Error at /nix/store/ad4c8nx2lkjs4zq0sj9jdpn7w45v9ccs-cmake-3.31.6/share/cmake-3.31/Modules/FindPackageHandleStandardArgs.cmake:233 (message): Could NOT find OpenGL (missing: OPENGL_opengl_LIBRARY OPENGL_glx_LIBRARY OPENGL_INCLUDE_DIR) ZHF: #403336 --- pkgs/by-name/na/nanosaur/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/na/nanosaur/package.nix b/pkgs/by-name/na/nanosaur/package.nix index 9bac2d99105f..7230d3322a27 100644 --- a/pkgs/by-name/na/nanosaur/package.nix +++ b/pkgs/by-name/na/nanosaur/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, SDL2, + libGL, cmake, makeWrapper, unstableGitUpdater, @@ -26,6 +27,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ SDL2 + libGL ]; installPhase = '' From df512e09a7818aefec8405a8f53683068dc5901e Mon Sep 17 00:00:00 2001 From: teto <886074+teto@users.noreply.github.com> Date: Sat, 3 May 2025 19:08:17 +0200 Subject: [PATCH 34/49] aws-lambda-rie: remove teto from maintainers I dont use it. I dont mind if we get rid of it --- pkgs/by-name/aw/aws-lambda-rie/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/aw/aws-lambda-rie/package.nix b/pkgs/by-name/aw/aws-lambda-rie/package.nix index bd53d7a73108..a5fe80fb2b7e 100644 --- a/pkgs/by-name/aw/aws-lambda-rie/package.nix +++ b/pkgs/by-name/aw/aws-lambda-rie/package.nix @@ -25,6 +25,6 @@ buildGoModule rec { mainProgram = "aws-lambda-rie"; homepage = "https://github.com/aws/aws-lambda-runtime-interface-emulator"; license = licenses.asl20; - maintainers = with maintainers; [ teto ]; + maintainers = [ ]; }; } From 5c7210f424678cbd01e0fba526a5907b74d2ce3f Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sat, 3 May 2025 11:57:28 -0700 Subject: [PATCH 35/49] python3Packages.kicad: Mark broken on Darwin --- pkgs/applications/science/electronics/kicad/base.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index d22d774e80f1..728aba18b1df 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -226,5 +226,6 @@ stdenv.mkDerivation rec { homepage = "https://www.kicad.org/"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.all; + broken = stdenv.hostPlatform.isDarwin; }; } From 48d4d2dc4b0d03f15f1b7a8e64cf340038eb45ba Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Sat, 3 May 2025 19:14:11 +0000 Subject: [PATCH 36/49] skypeexport: cleanup --- pkgs/by-name/sk/skypeexport/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sk/skypeexport/package.nix b/pkgs/by-name/sk/skypeexport/package.nix index 430d45c731c6..0fa6e418d7bc 100644 --- a/pkgs/by-name/sk/skypeexport/package.nix +++ b/pkgs/by-name/sk/skypeexport/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "Temptin"; repo = "SkypeExport"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Uy3bmylDm/3T7T48zBkuk3lbnWW6Ps4Huqz8NjSAk8Y="; }; @@ -32,12 +32,12 @@ stdenv.mkDerivation (finalAttrs: { preConfigure = "cd src/SkypeExport/_gccbuild/linux"; installPhase = "install -Dt $out/bin SkypeExport"; - meta = with lib; { + meta = { description = "Export Skype history to HTML"; mainProgram = "SkypeExport"; homepage = "https://github.com/Temptin/SkypeExport"; - license = licenses.gpl2; - platforms = platforms.unix; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.unix; maintainers = [ ]; }; }) From 7f6a5a6ed918c3754827402adb25a354698b4c09 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 3 May 2025 18:39:12 +0200 Subject: [PATCH 37/49] conftest: cleanup and modernise --- pkgs/by-name/co/conftest/package.nix | 36 +++++++++++++++------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/co/conftest/package.nix b/pkgs/by-name/co/conftest/package.nix index 409fd6999a5d..6878520d44c6 100644 --- a/pkgs/by-name/co/conftest/package.nix +++ b/pkgs/by-name/co/conftest/package.nix @@ -3,16 +3,18 @@ buildGoModule, fetchFromGitHub, installShellFiles, + versionCheckHook, + writableTmpDirAsHomeHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "conftest"; version = "0.59.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bmZp1cPNTm6m30YxjlWdnfv2437nDXH+taDNFZ0OKIY="; }; vendorHash = "sha256-aPvGbtAucb9OdcydO4dMLJrrM3XretPI7zyJULlm1fg="; @@ -20,17 +22,13 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/open-policy-agent/conftest/internal/commands.version=${version}" + "-X github.com/open-policy-agent/conftest/internal/commands.version=${finalAttrs.version}" ]; nativeBuildInputs = [ installShellFiles ]; - preCheck = '' - export HOME="$(mktemp -d)" - ''; - postInstall = '' installShellCompletion --cmd conftest \ --bash <($out/bin/conftest completion bash) \ @@ -38,19 +36,23 @@ buildGoModule rec { --zsh <($out/bin/conftest completion zsh) ''; - doInstallCheck = true; - installCheckPhase = '' - export HOME="$(mktemp -d)" - $out/bin/conftest --version | grep ${version} > /dev/null - ''; + nativeCheckInputs = [ + writableTmpDirAsHomeHook + ]; - meta = with lib; { + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + + meta = { description = "Write tests against structured configuration data"; mainProgram = "conftest"; downloadPage = "https://github.com/open-policy-agent/conftest"; homepage = "https://www.conftest.dev"; - changelog = "https://github.com/open-policy-agent/conftest/releases/tag/v${version}"; - license = licenses.asl20; + changelog = "https://github.com/open-policy-agent/conftest/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; longDescription = '' Conftest helps you write tests against structured configuration data. Using Conftest you can write tests for your Kubernetes configuration, @@ -61,9 +63,9 @@ buildGoModule rec { assertions. You can read more about Rego in 'How do I write policies' in the Open Policy Agent documentation. ''; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ jk yurrriq ]; }; -} +}) From f783f655af72fc765f666a611b4105aa9625e06d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 3 May 2025 20:54:33 +0200 Subject: [PATCH 38/49] broot: modernise, cleanup, use `versionCheckHook` --- pkgs/by-name/br/broot/package.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix index 4a17c10874ff..0d458da4f6b9 100644 --- a/pkgs/by-name/br/broot/package.nix +++ b/pkgs/by-name/br/broot/package.nix @@ -4,23 +4,24 @@ rustPlatform, fetchFromGitHub, installShellFiles, - makeWrapper, + makeBinaryWrapper, pkg-config, libgit2, zlib, buildPackages, + versionCheckHook, withClipboard ? true, withTrash ? !stdenv.hostPlatform.isDarwin, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "broot"; version = "1.46.3"; src = fetchFromGitHub { owner = "Canop"; repo = "broot"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-MfBlJ7SokBKkAkmBSj4NsE2hKVqYeGN3z/xiq2VK3vU="; }; @@ -29,7 +30,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles - makeWrapper + makeBinaryWrapper pkg-config ]; @@ -43,13 +44,13 @@ rustPlatform.buildRustPackage rec { buildFeatures = lib.optionals withTrash [ "trash" ] ++ lib.optionals withClipboard [ "clipboard" ]; - RUSTONIG_SYSTEM_LIBONIG = true; + env.RUSTONIG_SYSTEM_LIBONIG = true; postPatch = '' # Fill the version stub in the man page. We can't fill the date # stub reproducibly. substitute man/page man/broot.1 \ - --replace "#version" "${version}" + --replace-fail "#version" "${finalAttrs.version}" ''; postInstall = @@ -84,16 +85,15 @@ rustPlatform.buildRustPackage rec { ''; doInstallCheck = true; - installCheckPhase = '' - $out/bin/broot --version | grep "${version}" - ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; meta = with lib; { description = "Interactive tree view, a fuzzy search, a balanced BFS descent and customizable commands"; homepage = "https://dystroy.org/broot/"; - changelog = "https://github.com/Canop/broot/releases/tag/v${version}"; + changelog = "https://github.com/Canop/broot/releases/tag/v${finalAttrs.version}"; maintainers = with maintainers; [ dywedir ]; license = with licenses; [ mit ]; mainProgram = "broot"; }; -} +}) From 21d9d56c17a3f3a7ade2189d0ac71134332ed78a Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 3 May 2025 19:47:02 +0200 Subject: [PATCH 39/49] metal-cli: use `versionCheckHook` --- pkgs/by-name/me/metal-cli/package.nix | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/me/metal-cli/package.nix b/pkgs/by-name/me/metal-cli/package.nix index b13d6bb0d162..3f1e570e567d 100644 --- a/pkgs/by-name/me/metal-cli/package.nix +++ b/pkgs/by-name/me/metal-cli/package.nix @@ -3,16 +3,17 @@ buildGoModule, fetchFromGitHub, installShellFiles, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "metal-cli"; version = "0.25.0"; src = fetchFromGitHub { owner = "equinix"; - repo = pname; - rev = "v${version}"; + repo = "metal-cli"; + tag = "v${finalAttrs.version}"; hash = "sha256-+hpsGFZHuVhh+fKVcap0vhoUmRs3xPgUwW8SD56m6uI="; }; @@ -21,7 +22,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/equinix/metal-cli/cmd.Version=${version}" + "-X github.com/equinix/metal-cli/cmd.Version=${finalAttrs.version}" ]; nativeBuildInputs = [ @@ -38,21 +39,20 @@ buildGoModule rec { doCheck = false; doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/metal"; + versionCheckProgramArg = "--version"; - installCheckPhase = '' - $out/bin/metal --version | grep ${version} - ''; - - meta = with lib; { + meta = { description = "Official Equinix Metal CLI"; homepage = "https://github.com/equinix/metal-cli/"; - changelog = "https://github.com/equinix/metal-cli/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ + changelog = "https://github.com/equinix/metal-cli/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Br1ght0ne nshalman teutat3s ]; mainProgram = "metal"; }; -} +}) From e547f4f252b9ba059427495ca1d892be6d985112 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 3 May 2025 20:28:01 +0200 Subject: [PATCH 40/49] atlantis: use `versionCheckHook` --- pkgs/by-name/at/atlantis/package.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/at/atlantis/package.nix b/pkgs/by-name/at/atlantis/package.nix index a6872325b99d..57b74162f0b3 100644 --- a/pkgs/by-name/at/atlantis/package.nix +++ b/pkgs/by-name/at/atlantis/package.nix @@ -2,20 +2,22 @@ lib, buildGoModule, fetchFromGitHub, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "atlantis"; version = "0.34.0"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2xgU3H6X9EcbySV9RXN5oCn+7EkfdwebeYsL5+Vl69E="; }; + ldflags = [ - "-X=main.version=${version}" + "-X=main.version=${finalAttrs.version}" "-X=main.date=1970-01-01T00:00:00Z" ]; @@ -24,15 +26,15 @@ buildGoModule rec { subPackages = [ "." ]; doInstallCheck = true; - installCheckPhase = '' - $out/bin/atlantis version | grep ${version} > /dev/null - ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/atlantis"; + versionCheckProgramArg = "version"; - meta = with lib; { + meta = { homepage = "https://github.com/runatlantis/atlantis"; description = "Terraform Pull Request Automation"; mainProgram = "atlantis"; - license = licenses.asl20; - maintainers = with maintainers; [ jpotier ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jpotier ]; }; -} +}) From 1cb9626f62a166b4d07763abc53c8f5ac8d3c3e2 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 3 May 2025 22:45:04 +0200 Subject: [PATCH 41/49] ferretdb: use `versionCheckHook`, modernise, cleanup --- pkgs/by-name/fe/ferretdb/package.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/fe/ferretdb/package.nix b/pkgs/by-name/fe/ferretdb/package.nix index 438365de4091..6dbd19811140 100644 --- a/pkgs/by-name/fe/ferretdb/package.nix +++ b/pkgs/by-name/fe/ferretdb/package.nix @@ -3,21 +3,22 @@ buildGoModule, fetchFromGitHub, nixosTests, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "ferretdb"; version = "1.24.0"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-WMejspnk2PvJhvNGi4h+DF+fzipuOMcS1QWim5DnAhQ="; }; postPatch = '' - echo v${version} > build/version/version.txt + echo v${finalAttrs.version} > build/version/version.txt echo nixpkgs > build/version/package.txt ''; @@ -32,22 +33,21 @@ buildGoModule rec { # the binary panics if something required wasn't set during compilation doInstallCheck = true; - installCheckPhase = '' - $out/bin/ferretdb --version | grep ${version} - ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; passthru.tests = nixosTests.ferretdb; - meta = with lib; { + meta = { description = "Truly Open Source MongoDB alternative"; mainProgram = "ferretdb"; - changelog = "https://github.com/FerretDB/FerretDB/releases/tag/v${version}"; + changelog = "https://github.com/FerretDB/FerretDB/releases/tag/v${finalAttrs.version}"; homepage = "https://www.ferretdb.com/"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dit7ya noisersup julienmalka ]; }; -} +}) From b0e3140841e20018df3cf42a353b3d5336319334 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 3 May 2025 22:25:12 +0200 Subject: [PATCH 42/49] oras: use `versionCheckHook`, modernise, cleanup --- pkgs/by-name/or/oras/package.nix | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/or/oras/package.nix b/pkgs/by-name/or/oras/package.nix index da05223e2f2f..b8ae0063f634 100644 --- a/pkgs/by-name/or/oras/package.nix +++ b/pkgs/by-name/or/oras/package.nix @@ -5,16 +5,17 @@ installShellFiles, testers, oras, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "oras"; version = "1.2.3"; src = fetchFromGitHub { owner = "oras-project"; repo = "oras"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-IXIw2prApg5iL3BPbOY4x09KjyhFvKofgfz2L6UXKR8="; }; @@ -27,7 +28,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X oras.land/oras/internal/version.Version=${version}" + "-X oras.land/oras/internal/version.Version=${finalAttrs.version}" "-X oras.land/oras/internal/version.BuildMetadata=" "-X oras.land/oras/internal/version.GitTreeState=clean" ]; @@ -40,29 +41,18 @@ buildGoModule rec { ''; doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; - $out/bin/oras --help - $out/bin/oras version | grep "${version}" - - runHook postInstallCheck - ''; - - passthru.tests.version = testers.testVersion { - package = oras; - command = "oras version"; - }; - - meta = with lib; { + meta = { homepage = "https://oras.land/"; - changelog = "https://github.com/oras-project/oras/releases/tag/v${version}"; + changelog = "https://github.com/oras-project/oras/releases/tag/v${finalAttrs.version}"; description = "ORAS project provides a way to push and pull OCI Artifacts to and from OCI Registries"; mainProgram = "oras"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jk developer-guy ]; }; -} +}) From c85d8c61ac2cade6ddeff65d8fd83420935c6b81 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sat, 3 May 2025 23:31:50 +0200 Subject: [PATCH 43/49] newsraft: 0.29 -> 0.30 --- pkgs/by-name/ne/newsraft/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ne/newsraft/package.nix b/pkgs/by-name/ne/newsraft/package.nix index 419bb9dc16ca..d4a26ba50c26 100644 --- a/pkgs/by-name/ne/newsraft/package.nix +++ b/pkgs/by-name/ne/newsraft/package.nix @@ -8,20 +8,19 @@ gumbo, ncurses, sqlite, - yajl, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "newsraft"; - version = "0.29"; + version = "0.30"; src = fetchFromGitea { domain = "codeberg.org"; owner = "newsraft"; repo = "newsraft"; rev = "newsraft-${finalAttrs.version}"; - hash = "sha256-6rDnGVOApSURuXom+XxPPOG7lxMbHGTL+4Oqrx+Jq2w="; + hash = "sha256-h9gjw2EjWWNdyQT2p4wgWlz4TNitDBX5fPbNNH9/th4="; }; nativeBuildInputs = [ pkg-config ]; @@ -31,7 +30,6 @@ stdenv.mkDerivation (finalAttrs: { gumbo ncurses sqlite - yajl ]; makeFlags = [ "PREFIX=$(out)" ]; From 1db6b4269aa05e7f383633237d51a378c7acdfa8 Mon Sep 17 00:00:00 2001 From: patka Date: Sat, 3 May 2025 18:14:49 +0200 Subject: [PATCH 44/49] ultrastardx: remove no longer used pcre dependency pcre has been removed upstream in commit e512768dae87f4abd3d67dd4dfba3fb24e90575d in 2017. It builds fine without it and there's no mention of it during build output --- pkgs/by-name/ul/ultrastardx/package.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/by-name/ul/ultrastardx/package.nix b/pkgs/by-name/ul/ultrastardx/package.nix index 5e903092fc25..d16855befab9 100644 --- a/pkgs/by-name/ul/ultrastardx/package.nix +++ b/pkgs/by-name/ul/ultrastardx/package.nix @@ -6,7 +6,6 @@ pkg-config, lua, fpc, - pcre, portaudio, freetype, libpng, @@ -26,7 +25,6 @@ let sharedLibs = [ - pcre portaudio freetype SDL2 @@ -65,11 +63,6 @@ stdenv.mkDerivation rec { libpng ] ++ sharedLibs; - postPatch = '' - substituteInPlace src/config.inc.in \ - --subst-var-by libpcre_LIBNAME libpcre.so.1 - ''; - preBuild = let items = lib.concatMapStringsSep " " (x: "-rpath ${lib.getLib x}/lib") sharedLibs; From 59c7764cbaa2c72e2c49ac8997007ab69e82a2d4 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sun, 4 May 2025 01:06:40 +0200 Subject: [PATCH 45/49] newsraft: install desktop file --- pkgs/by-name/ne/newsraft/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ne/newsraft/package.nix b/pkgs/by-name/ne/newsraft/package.nix index d4a26ba50c26..11228ceca7c6 100644 --- a/pkgs/by-name/ne/newsraft/package.nix +++ b/pkgs/by-name/ne/newsraft/package.nix @@ -34,6 +34,10 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=$(out)" ]; + postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + install -Dm444 doc/newsraft.desktop -t $out/share/applications + ''; + passthru.updateScript = nix-update-script { }; meta = { From c0ec90202e4e99a4c7e1439211d6810144d4e7c5 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sat, 3 May 2025 17:04:18 -0700 Subject: [PATCH 46/49] python3Packages.qcodes: Disable additional flaky tests --- pkgs/development/python-modules/qcodes/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix index c89d785f6c7b..5745474b037e 100644 --- a/pkgs/development/python-modules/qcodes/default.nix +++ b/pkgs/development/python-modules/qcodes/default.nix @@ -173,7 +173,9 @@ buildPythonPackage rec { disabledTests = [ # Tests are time-sensitive and power-consuming # Those tests fails repeatably and are flaky + "test_access_channels_by_name" "test_access_channels_by_slice" + "test_access_channels_by_tuple" "test_aggregator" "test_datasaver" "test_do1d_additional_setpoints_shape" @@ -181,7 +183,9 @@ buildPythonPackage rec { "test_field_limits" "test_get_array_in_scalar_param_data" "test_get_parameter_data" + "test_measured" "test_ramp_safely" + "test_ramp_scaled" # more flaky tests # https://github.com/microsoft/Qcodes/issues/5551 From 1c9c74626864cbc556f2c2f739c0a999b3945178 Mon Sep 17 00:00:00 2001 From: emaryn <197520219+emaryn@users.noreply.github.com> Date: Sun, 4 May 2025 09:03:59 +0800 Subject: [PATCH 47/49] Revert "mihomo-party: mark as insecure" --- pkgs/by-name/mi/mihomo-party/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix index bef256bd5022..ecdc61aebd4b 100644 --- a/pkgs/by-name/mi/mihomo-party/package.nix +++ b/pkgs/by-name/mi/mihomo-party/package.nix @@ -87,6 +87,5 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ ]; - knownVulnerabilities = [ "https://github.com/mihomo-party-org/mihomo-party/issues/706" ]; }; } From 2545e768530daee1521dcb83dc1913d412e1b42b Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Sun, 4 May 2025 07:17:39 +0000 Subject: [PATCH 48/49] skypeexport: fix build against Boost >= 1.85 --- pkgs/by-name/sk/skypeexport/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/sk/skypeexport/package.nix b/pkgs/by-name/sk/skypeexport/package.nix index 0fa6e418d7bc..5ed838986f30 100644 --- a/pkgs/by-name/sk/skypeexport/package.nix +++ b/pkgs/by-name/sk/skypeexport/package.nix @@ -26,6 +26,15 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + # fix build against Boost >= 1.85 + # https://github.com/Temptin/SkypeExport/pull/24 + postPatch = '' + substituteInPlace src/SkypeExport/main.cpp \ + --replace-fail \ + '.leaf()' \ + '.filename()' + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ boost ]; From 0140aa3cb7a15242a8eb9a50f0558506e120461c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 28 Apr 2025 22:47:45 +0100 Subject: [PATCH 49/49] scsh: fix the build against `gcc-14` Without the change `scsh` build fails on `master` as https://hydra.nixos.org/build/294813946: c/syscalls.c: In function 'sleep_until': c/syscalls.c:711:18: error: implicit declaration of function 'time' [] 711 | time_t now = time(0); | ^~~~ --- pkgs/by-name/sc/scsh/gcc-14-p1.patch | 33 ++++++++++++++++++++++++++++ pkgs/by-name/sc/scsh/gcc-14-p2.patch | 31 ++++++++++++++++++++++++++ pkgs/by-name/sc/scsh/package.nix | 9 ++++++++ 3 files changed, 73 insertions(+) create mode 100644 pkgs/by-name/sc/scsh/gcc-14-p1.patch create mode 100644 pkgs/by-name/sc/scsh/gcc-14-p2.patch diff --git a/pkgs/by-name/sc/scsh/gcc-14-p1.patch b/pkgs/by-name/sc/scsh/gcc-14-p1.patch new file mode 100644 index 000000000000..30dfa6135267 --- /dev/null +++ b/pkgs/by-name/sc/scsh/gcc-14-p1.patch @@ -0,0 +1,33 @@ +https://github.com/scheme/scsh/pull/50.patch + +From edced224436fa70cd7d885fe65996b9c3cfd33d7 Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Mon, 28 Apr 2025 22:40:31 +0100 +Subject: [PATCH] c/syscalls.c: add missing `` icnlude + +Without the change the build fails for me as: + + c/syscalls.c: In function 'sleep_until': + c/syscalls.c:711:18: error: implicit declaration of function 'time' [-Wimplicit-function-declaration] + 711 | time_t now = time(0); + | ^~~~ + c/syscalls.c:41:1: note: 'time' is defined in header ''; this is probably fixable by adding '#include ' + 40 | #include "syscalls.h" + +++ |+#include + 41 | +--- + c/syscalls.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/c/syscalls.c b/c/syscalls.c +index fe11e81..2be25a8 100644 +--- a/c/syscalls.c ++++ b/c/syscalls.c +@@ -5,6 +5,7 @@ + + #include + #include ++#include /* for time() */ + #include + #include + #include diff --git a/pkgs/by-name/sc/scsh/gcc-14-p2.patch b/pkgs/by-name/sc/scsh/gcc-14-p2.patch new file mode 100644 index 000000000000..c32793e6c60f --- /dev/null +++ b/pkgs/by-name/sc/scsh/gcc-14-p2.patch @@ -0,0 +1,31 @@ +https://github.com/scheme/scsh/pull/51.patch + +From b2934abb68d6adab448f24787192c047e46cf17c Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Mon, 28 Apr 2025 22:39:55 +0100 +Subject: [PATCH] configure.ac: add detection of `pty.h` + +Without the change the build on modern autoconf fails as: + + c/tty.c: In function 'allocate_master': + c/tty.c:398:14: error: implicit declaration of function 'openpty'; did you mean 'openat'? [-Wimplicit-function-declaration] + 398 | rc = openpty (&master_fd, &slave_fd, NULL, NULL, NULL); + | ^~~~~~~ + | openat +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 99779dc..1cd8b22 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -32,7 +32,7 @@ CPPFLAGS="$CPPFLAGS -I$S48DIR/include" + # Checks for libraries. + + # Checks for header files. +-AC_CHECK_HEADERS([fcntl.h limits.h netdb.h sgtty.h stdlib.h string.h sys/ioctl.h sys/param.h sys/time.h termios.h unistd.h utime.h]) ++AC_CHECK_HEADERS([fcntl.h limits.h netdb.h pty.h sgtty.h stdlib.h string.h sys/ioctl.h sys/param.h sys/time.h termios.h unistd.h utime.h]) + + dnl We need the scheme48.h headers, so bomb out if we can't find them. + AC_CHECK_HEADERS([scheme48.h], [], diff --git a/pkgs/by-name/sc/scsh/package.nix b/pkgs/by-name/sc/scsh/package.nix index d6d9d1a2ca22..7199980aa06a 100644 --- a/pkgs/by-name/sc/scsh/package.nix +++ b/pkgs/by-name/sc/scsh/package.nix @@ -19,6 +19,15 @@ stdenv.mkDerivation { fetchSubmodules = true; }; + patches = [ + # Fix the build against gcc-14: + # https://github.com/scheme/scsh/pull/50 + ./gcc-14-p1.patch + # Fix the build against gcc-14: + # https://github.com/scheme/scsh/pull/51 + ./gcc-14-p2.patch + ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ scheme48 ]; configureFlags = [ "--with-scheme48=${scheme48}" ];