From d909b947042fcbefa44ce118d4da6a24e50d6bc9 Mon Sep 17 00:00:00 2001 From: Jeff Spiers Date: Wed, 11 Dec 2024 20:26:04 -0700 Subject: [PATCH 01/90] joplin-desktop: exclude apple code signatures when unpacking DMG archive with 7zz on x86_64-darwin --- pkgs/by-name/jo/joplin-desktop/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/jo/joplin-desktop/package.nix b/pkgs/by-name/jo/joplin-desktop/package.nix index b8b46c977184..9f1a227e906e 100644 --- a/pkgs/by-name/jo/joplin-desktop/package.nix +++ b/pkgs/by-name/jo/joplin-desktop/package.nix @@ -68,7 +68,7 @@ let unpackPhase = '' runHook preUnpack - 7zz x -x'!Joplin ${version}/Applications' $src + 7zz x -x'!Joplin ${version}/Applications' -xr'!*:com.apple.cs.Code*' $src runHook postUnpack ''; From e0c600835f94e8c535f4c8006194189a523036e2 Mon Sep 17 00:00:00 2001 From: diniamo Date: Fri, 24 Jan 2025 06:11:03 +0100 Subject: [PATCH 02/90] wtwitch: improvements - Add `with...` flags for the major players, and only enable mpv by default - Use `stdenvNoCC` - Avoid `with lib` - Avoid `rec`, `pname` in fetcher and use `tag` - Add missing hooks - Add missing dependency (fzf) --- pkgs/by-name/wt/wtwitch/package.nix | 39 +++++++++++++++++++---------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/wt/wtwitch/package.nix b/pkgs/by-name/wt/wtwitch/package.nix index cf9d19877857..569f32735d2d 100644 --- a/pkgs/by-name/wt/wtwitch/package.nix +++ b/pkgs/by-name/wt/wtwitch/package.nix @@ -13,19 +13,23 @@ mpv, procps, scdoc, - stdenv, + stdenvNoCC, streamlink, vlc, + fzf, + withMpv ? true, + withVlc ? false, + withMplayer ? false, }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "wtwitch"; version = "2.6.3"; src = fetchFromGitHub { owner = "krathalan"; - repo = pname; - rev = version; + repo = "wtwitch"; + tag = finalAttrs.version; hash = "sha256-2YLBuxGwGkav3zB2qMqM6yRXf7ZLqgULoJV4s5p+hSw="; }; @@ -35,7 +39,11 @@ stdenv.mkDerivation rec { ''; buildPhase = '' + runHook preBuild + scdoc < src/wtwitch.1.scd > wtwitch.1 + + runHook postBuild ''; nativeBuildInputs = [ @@ -45,6 +53,8 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall + installManPage wtwitch.1 installShellCompletion --cmd wtwitch \ --bash src/wtwitch-completion.bash \ @@ -54,29 +64,32 @@ stdenv.mkDerivation rec { --set-default LANG en_US.UTF-8 \ --prefix PATH : ${ lib.makeBinPath ( - lib.optionals stdenv.hostPlatform.isLinux [ vlc ] - ++ [ + [ bash coreutils-prefixed curl gnused gnugrep jq - mplayer - mpv procps streamlink + fzf ] + ++ lib.optional withMpv mpv + ++ lib.optional withVlc vlc + ++ lib.optional withMplayer mplayer ) } + + runHook postInstall ''; - meta = with lib; { + meta = { description = "Terminal user interface for Twitch"; homepage = "https://github.com/krathalan/wtwitch"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ urandom ]; - platforms = platforms.all; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.urandom ]; + platforms = lib.platforms.all; mainProgram = "wtwitch"; }; -} +}) From c0147bb6cb3ac847a1f7157dfa564d30661a429c Mon Sep 17 00:00:00 2001 From: Marco Santonastaso Date: Tue, 12 Nov 2024 15:13:58 +0000 Subject: [PATCH 03/90] maintainers: add marnas and conduktorbot --- maintainers/maintainer-list.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 44e4b1111ed0..b6ea2c789921 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4678,6 +4678,12 @@ githubId = 6487079; name = "Dane Rieber"; }; + conduktorbot = { + email = "automation@conduktor.io"; + github = "conduktorbot"; + githubId = 96434751; + name = "Conduktor Bot"; + }; confus = { email = "con-f-use@gmx.net"; github = "con-f-use"; @@ -14303,6 +14309,12 @@ githubId = 1709273; name = "Robin Hack"; }; + marnas = { + email = "marco@santonastaso.com"; + name = "Marco Santonastaso"; + github = "marnas"; + githubId = 39352252; + }; marnym = { email = "markus@nyman.dev"; github = "marnym"; From b5e8ee3b3abf2f1af37eef75d62fdaf582f488fa Mon Sep 17 00:00:00 2001 From: Marco Santonastaso Date: Thu, 14 Nov 2024 17:45:34 +0000 Subject: [PATCH 04/90] conduktor-ctl: init at 0.4.0 --- pkgs/by-name/co/conduktor-ctl/package.nix | 60 +++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 pkgs/by-name/co/conduktor-ctl/package.nix diff --git a/pkgs/by-name/co/conduktor-ctl/package.nix b/pkgs/by-name/co/conduktor-ctl/package.nix new file mode 100644 index 000000000000..2b5cd8832535 --- /dev/null +++ b/pkgs/by-name/co/conduktor-ctl/package.nix @@ -0,0 +1,60 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + stdenv, + versionCheckHook, +}: +buildGoModule rec { + pname = "conduktor-ctl"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "conduktor"; + repo = "ctl"; + rev = "refs/tags/v${version}"; + hash = "sha256-NNhaYBhLCCVXBbZKKefPRk1CD8GQm98FvChgeHvPDKs="; + }; + + vendorHash = "sha256-kPCBzLU6aH6MNlKZcKKFcli99ZmdOtPV5+5gxPs5GH4="; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ "-X github.com/conduktor/ctl/utils.version=${version}" ]; + + checkPhase = '' + go test ./... + ''; + + postInstall = + '' + mv $out/bin/ctl $out/bin/conduktor + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd conduktor \ + --bash <($out/bin/conduktor completion bash) \ + --fish <($out/bin/conduktor completion fish) \ + --zsh <($out/bin/conduktor completion zsh) + ''; + + doInstallCheck = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + versionCheckProgram = "${placeholder "out"}/bin/conduktor"; + + versionCheckProgramArg = "version"; + + meta = { + description = "CLI tool to interact with the Conduktor Console and Gateway"; + mainProgram = "conduktor"; + homepage = "https://github.com/conduktor/ctl"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + conduktorbot + marnas + ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} From 69641d3531756c88e1edf7b112f8c3dd76530f9c Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Sun, 9 Mar 2025 15:07:53 +0100 Subject: [PATCH 05/90] installer/tools: fix grammatical error in docs --- nixos/modules/installer/tools/tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 1adf1ea39424..de9319ad1533 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -254,7 +254,7 @@ in description = '' Disable nixos-rebuild, nixos-generate-config, nixos-installer and other NixOS tools. This is useful to shrink embedded, - read-only systems which are not expected to be rebuild or + read-only systems which are not expected to rebuild or reconfigure themselves. Use at your own risk! ''; }; From fae641502513324cece5202570bcc487bd6be464 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 26 Mar 2025 15:09:41 +0100 Subject: [PATCH 06/90] libowfat: mark cross as broken --- pkgs/by-name/li/libowfat/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libowfat/package.nix b/pkgs/by-name/li/libowfat/package.nix index b1ce3864dd16..99aefdd2590c 100644 --- a/pkgs/by-name/li/libowfat/package.nix +++ b/pkgs/by-name/li/libowfat/package.nix @@ -22,7 +22,10 @@ stdenv.mkDerivation rec { make headers ''; - makeFlags = [ "prefix=$(out)" ]; + makeFlags = [ + "prefix=$(out)" + "CC=${stdenv.cc.targetPrefix}cc" + ]; enableParallelBuilding = true; meta = with lib; { @@ -30,5 +33,7 @@ stdenv.mkDerivation rec { homepage = "https://www.fefe.de/libowfat/"; license = licenses.gpl2; platforms = platforms.linux; + # build tool "json" is built for the host platform + broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; }; } From fc3ceeebc6f099b1d126878200b5b1f05345a0b8 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sat, 29 Mar 2025 12:06:38 +0100 Subject: [PATCH 07/90] boringssl: run installPhase hooks --- pkgs/by-name/bo/boringssl/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/bo/boringssl/package.nix b/pkgs/by-name/bo/boringssl/package.nix index 9c8ea8edad61..fa45b473b54a 100644 --- a/pkgs/by-name/bo/boringssl/package.nix +++ b/pkgs/by-name/bo/boringssl/package.nix @@ -55,6 +55,8 @@ buildGoModule { ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ "-DCMAKE_OSX_ARCHITECTURES=" ]; installPhase = '' + runHook preInstall + mkdir -p $bin/bin $dev $out/lib mv tool/bssl $bin/bin @@ -64,6 +66,8 @@ buildGoModule { mv decrepit/libdecrepit.a $out/lib mv ../include $dev + + runHook postInstall ''; outputs = [ From f7f3d17a58f84914c47e33f865b7ad2412668e02 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 24 Jan 2025 14:12:36 -0500 Subject: [PATCH 08/90] python312Packages.fastremap: init at 1.15.1 --- .../python-modules/fastremap/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/fastremap/default.nix diff --git a/pkgs/development/python-modules/fastremap/default.nix b/pkgs/development/python-modules/fastremap/default.nix new file mode 100644 index 000000000000..0e2fd9cfbefd --- /dev/null +++ b/pkgs/development/python-modules/fastremap/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + cython, + numpy, + pbr, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "fastremap"; + version = "1.15.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "seung-lab"; + repo = "fastremap"; + tag = version; + hash = "sha256-naDagGD0VNRjoJ1+gkgLm3QbrnE9hD85ULz91xAfKa4="; + }; + + build-system = [ + cython + numpy + pbr + setuptools + ]; + + dependencies = [ + numpy + ]; + + env.PBR_VERSION = version; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "fastremap" + ]; + + meta = { + description = "Remap, mask, renumber, unique, and in-place transposition of 3D labeled images and point clouds"; + homepage = "https://github.com/seung-lab/fastremap"; + changelog = "https://github.com/seung-lab/fastremap/releases/tag/${version}"; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0b82934d8f7d..cf3d72102610 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4768,6 +4768,8 @@ self: super: with self; { fastprogress = callPackage ../development/python-modules/fastprogress { }; + fastremap = callPackage ../development/python-modules/fastremap { }; + fastrlock = callPackage ../development/python-modules/fastrlock { }; fasttext = callPackage ../development/python-modules/fasttext { }; From c003c7dfcca56233263644800efaa277471a4e1a Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 21 Oct 2024 22:03:53 -0400 Subject: [PATCH 09/90] python312Packages.connected-components-3d: init at 3.22.0 --- .../connected-components-3d/default.nix | 61 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/development/python-modules/connected-components-3d/default.nix diff --git a/pkgs/development/python-modules/connected-components-3d/default.nix b/pkgs/development/python-modules/connected-components-3d/default.nix new file mode 100644 index 000000000000..07097becde00 --- /dev/null +++ b/pkgs/development/python-modules/connected-components-3d/default.nix @@ -0,0 +1,61 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + cython, + numpy, + pbr, + fastremap, + pytestCheckHook, + scipy, +}: + +buildPythonPackage rec { + pname = "connected-components-3d"; + version = "3.22.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "seung-lab"; + repo = "connected-components-3d"; + tag = version; + hash = "sha256-txgQY9k96hFKLrKVLE6ldPdNbSnKOk2FIMrHkRQXlPk="; + }; + + build-system = [ + cython + numpy + pbr + setuptools + ]; + + dependencies = [ numpy ]; + + optional-dependencies = { + stack = [ + # crackle-codec # not in nixpkgs + fastremap + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + scipy + ] ++ optional-dependencies.stack; + + disabledTests = [ + # requires optional dependency crackle-codec (not in nixpkgs) + "test_connected_components_stack" + ]; + + pythonImportsCheck = [ "cc3d" ]; + + meta = { + description = "Connected components on discrete and continuous multilabel 3D & 2D images"; + homepage = "https://github.com/seung-lab/connected-components-3d"; + changelog = "https://github.com/seung-lab/connected-components-3d/releases/tag/${version}"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cf3d72102610..71408f79e270 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2763,6 +2763,8 @@ self: super: with self; { connect-box = callPackage ../development/python-modules/connect-box { }; + connected-components-3d = callPackage ../development/python-modules/connected-components-3d { }; + connection-pool = callPackage ../development/python-modules/connection-pool { }; connexion = callPackage ../development/python-modules/connexion { }; From 71e5dc4dd96b187579761063bece54d07d9c6411 Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Thu, 17 Apr 2025 16:08:51 +0800 Subject: [PATCH 10/90] python3Packages.sdflit: init at 0.2.6 --- .../python-modules/sdflit/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/sdflit/default.nix diff --git a/pkgs/development/python-modules/sdflit/default.nix b/pkgs/development/python-modules/sdflit/default.nix new file mode 100644 index 000000000000..fbb48e9bb131 --- /dev/null +++ b/pkgs/development/python-modules/sdflit/default.nix @@ -0,0 +1,47 @@ +{ + lib, + fetchFromGitHub, + buildPythonPackage, + cargo, + rustPlatform, + rustc, +}: + +let + version = "0.2.6"; + + src = fetchFromGitHub { + owner = "yzx9"; + repo = "sdflit"; + tag = "v${version}"; + hash = "sha256-Ze3J5Dp+TskhIiGP6kMK3AIHLnhVBuEaKJokccIr+SM="; + }; +in +buildPythonPackage { + pname = "sdflit"; + inherit version src; + pyproject = true; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src; + hash = "sha256-CrMe5DuO9sQZZ50Hy+av4nF4gbOe296zSWJfJ8th7zs="; + }; + + build-system = [ + cargo + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + rustc + ]; + + pythonImportsCheck = [ + "sdflit" + ]; + + meta = { + description = "Fast and Robust Signed Distance Function Library"; + homepage = "https://github.com/yzx9/sdflit"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ yzx9 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 488efa43c9bf..da56c50d4fac 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15469,6 +15469,8 @@ self: super: with self; { sdds = callPackage ../development/python-modules/sdds { }; + sdflit = callPackage ../development/python-modules/sdflit { }; + sdjson = callPackage ../development/python-modules/sdjson { }; sdkmanager = callPackage ../development/python-modules/sdkmanager { }; From 52101e631cbf9b51df24352fc7ebd71cb9555d8b Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Tue, 22 Apr 2025 12:44:08 +0200 Subject: [PATCH 11/90] nodejs_20: 20.19.0 -> 20.19.1 --- pkgs/development/web/nodejs/v20.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index 20cceb5b5d1c..a9ba7efe7ae5 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -18,8 +18,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.19.0"; - sha256 = "5ac2516fc905b6a0bc1a33e7302937eac664a820b887cc86bd48c035fba392d7"; + version = "20.19.1"; + sha256 = "5587b23e907d0c7af2ea8a8deb33ec50010453b46dbb3df5987c5678eee5ed51"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch From c1d3a123a4440b2e365eea94aa01c6acfdd88953 Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Thu, 17 Apr 2025 16:09:34 +0800 Subject: [PATCH 12/90] python3Packages.imagecodecs: init at 2025.3.30 --- .../python-modules/imagecodecs/default.nix | 90 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 92 insertions(+) create mode 100644 pkgs/development/python-modules/imagecodecs/default.nix diff --git a/pkgs/development/python-modules/imagecodecs/default.nix b/pkgs/development/python-modules/imagecodecs/default.nix new file mode 100644 index 000000000000..30dfe4dc7de7 --- /dev/null +++ b/pkgs/development/python-modules/imagecodecs/default.nix @@ -0,0 +1,90 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + cython, + numpy, + setuptools, + pkgs, + jxrlib, + lcms2, + lerc, + libdeflate, + libpng, + libtiff, + libwebp, + openjpeg, + xz, + zlib, + zstd, + pytest, +}: + +let + version = "2025.3.30"; +in +buildPythonPackage { + pname = "imagecodecs"; + inherit version; + pyproject = true; + + src = fetchFromGitHub { + owner = "cgohlke"; + repo = "imagecodecs"; + tag = "v${version}"; + hash = "sha256-KtrQNABQOr3mNiWOfaZBcFceSCixPGV8Hte2uPKn1+k="; + }; + + build-system = [ + cython + numpy + setuptools + ]; + + nativeBuildInputs = [ + pkgs.lz4.dev # lz4 was hidden by python3Packages.lz4 + lcms2.dev + openjpeg.dev + ]; + + buildInputs = [ + pkgs.lz4 + jxrlib + lcms2 + lerc + libdeflate + libpng + libtiff + libwebp + openjpeg + xz # liblzma + zlib + zstd + ]; + + dependencies = [ + numpy + ]; + + prePatch = '' + substituteInPlace setup.py \ + --replace-fail "/usr/include/openjpeg" "${openjpeg.dev}/include/openjpeg" \ + --replace-fail "/usr/include/jxrlib" "${jxrlib}/include/jxrlib" + ''; + + nativeCheckInputs = [ + pytest + ]; + + pythonImportsCheck = [ + "imagecodecs" + ]; + + meta = { + description = "Image transformation, compression, and decompression codecs"; + homepage = "https://github.com/cgohlke/imagecodecs"; + changelog = "https://github.com/cgohlke/imagecodecs/blob/v${version}/CHANGES.rst"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ yzx9 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index da56c50d4fac..f2d7e44aa04f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6572,6 +6572,8 @@ self: super: with self; { image-go-nord = callPackage ../development/python-modules/image-go-nord { }; + imagecodecs = callPackage ../development/python-modules/imagecodecs { }; + imagecodecs-lite = callPackage ../development/python-modules/imagecodecs-lite { }; imagecorruptions = callPackage ../development/python-modules/imagecorruptions { }; From 553e460cc0b63c27dd2871d21c95e69c0a551848 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 6 May 2025 12:04:18 +0900 Subject: [PATCH 13/90] zenn-cli: 0.1.157 -> 0.1.159 Diff: https://github.com/zenn-dev/zenn-editor/compare/refs/tags/0.1.157...refs/tags/0.1.159 Changelog: https://github.com/zenn-dev/zenn-editor/releases/tag/0.1.159 --- pkgs/by-name/ze/zenn-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ze/zenn-cli/package.nix b/pkgs/by-name/ze/zenn-cli/package.nix index 0abf85d292aa..eac27008ec60 100644 --- a/pkgs/by-name/ze/zenn-cli/package.nix +++ b/pkgs/by-name/ze/zenn-cli/package.nix @@ -35,13 +35,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "zenn-cli"; - version = "0.1.157"; + version = "0.1.159"; src = fetchFromGitHub { owner = "zenn-dev"; repo = "zenn-editor"; tag = finalAttrs.version; - hash = "sha256-1+5UaSYtY00F+1oJfovLIBPnmfRnKpIkQHpxb93rO2k="; + hash = "sha256-q28XSsGf+Uz+FTRwyu1xg/8bnYxuL6Jt+t3mk0CcWGY="; # turborepo requires .git directory leaveDotGit = true; }; From bacd22137e2878bd93db1d403750d27c9cf058cd Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 6 May 2025 13:26:34 +0900 Subject: [PATCH 14/90] libmcfp: 1.3.5 -> 1.4.2 Diff: https://github.com/mhekkel/libmcfp/compare/refs/tags/v1.3.5...refs/tags/v1.4.2 Changelog: https://github.com/mhekkel/libmcfp/blob/refs/tags/v1.4.2/changelog --- pkgs/by-name/li/libmcfp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libmcfp/package.nix b/pkgs/by-name/li/libmcfp/package.nix index 81643693b47b..dc07d6117e10 100644 --- a/pkgs/by-name/li/libmcfp/package.nix +++ b/pkgs/by-name/li/libmcfp/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmcfp"; - version = "1.3.5"; + version = "1.4.2"; src = fetchFromGitHub { owner = "mhekkel"; repo = "libmcfp"; tag = "v${finalAttrs.version}"; - hash = "sha256-e4scwaCwKU2M5FJ/+UTNDigazopQwGhCIqDatQX7ERw="; + hash = "sha256-qKmSkVuxY5kXQ1eSs/T500lFpCLzU3sXAoUmpXhTUp4="; }; nativeBuildInputs = [ From 233d20f90d208c187d3ea8b0e5104d024d3841dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 May 2025 12:55:36 +0000 Subject: [PATCH 15/90] syslogng: 4.8.1 -> 4.8.2 --- pkgs/by-name/sy/syslogng/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sy/syslogng/package.nix b/pkgs/by-name/sy/syslogng/package.nix index 455aff78d5d9..205bc2c8dd57 100644 --- a/pkgs/by-name/sy/syslogng/package.nix +++ b/pkgs/by-name/sy/syslogng/package.nix @@ -66,13 +66,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "syslog-ng"; - version = "4.8.1"; + version = "4.8.2"; src = fetchFromGitHub { owner = "syslog-ng"; repo = "syslog-ng"; rev = "syslog-ng-${finalAttrs.version}"; - hash = "sha256-YdGbDpGMC0DPuPSbfe9HvZshBVdv1s1+hiHDnhYbs6Q="; + hash = "sha256-iWH64e5LBEiIy/A5N8pfOkjbn9wbmAswk2NhGyJ63f8="; fetchSubmodules = true; }; nativeBuildInputs = [ From 8c22d0fafc10e8706c83bc2d9aebe062e2d157f6 Mon Sep 17 00:00:00 2001 From: eljamm Date: Sun, 27 Apr 2025 00:38:30 +0200 Subject: [PATCH 16/90] evcxr: 0.17.0 -> 0.19.0 --- pkgs/by-name/ev/evcxr/package.nix | 34 ++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ev/evcxr/package.nix b/pkgs/by-name/ev/evcxr/package.nix index c5c35893e00d..e00902d7d4e6 100644 --- a/pkgs/by-name/ev/evcxr/package.nix +++ b/pkgs/by-name/ev/evcxr/package.nix @@ -7,23 +7,25 @@ lib, stdenv, gcc, + mold, + rustc, cmake, libiconv, }: rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.17.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${version}"; - sha256 = "sha256-6gSJJ3ptqpYydjg+xf5Pz3iTk0D+bkC6N79OeiKxPHY="; + sha256 = "sha256-8PjZFWUH76QrA8EI9Cx0sBCzocvSmnp84VD7Nv9QMc8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-U2LBesQNOa/E/NkVeLulb8JUtGsHgMne0MgY0RT9lqI="; + cargoHash = "sha256-hE/O6lHC0o+nrN4vaQ155Nn2gZscpfsZ6o7IDi/IEjI="; RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; @@ -37,12 +39,28 @@ rustPlatform.buildRustPackage rec { ]; checkFlags = [ - # test broken with rust 1.69: - # * https://github.com/evcxr/evcxr/issues/294 - # * https://github.com/NixOS/nixpkgs/issues/229524 - "--skip=check_for_errors" + # outdated rust-analyzer (disabled, upstream) + # https://github.com/evcxr/evcxr/blob/fcdac75f49dcab3229524e671d4417d36c12130b/evcxr/tests/integration_tests.rs#L741 + # https://github.com/evcxr/evcxr/issues/295 + "--skip=partially_inferred_variable_type" + # fail, but can't reproduce in the REPL + "--skip=code_completion" + "--skip=save_and_restore_variables" ]; + # Some tests fail when types aren't explicitly specified, but which can't be + # reproduced inside the REPL. + # Likely related to https://github.com/evcxr/evcxr/issues/295 + postConfigure = '' + substituteInPlace evcxr/tests/integration_tests.rs \ + --replace-fail "let var2 = String" "let var2: String = String" `# code_completion` \ + --replace-fail "let a = vec" "let a: Vec = vec" `# function_panics_{with,without}_variable_preserving` \ + --replace-fail "let a = Some(" "let a: Option = Some(" `# moved_value` \ + --replace-fail "let a = \"foo\"" "let a: String = \"foo\"" `# statement_and_expression` \ + --replace-fail "let owned = \"owned\"" "let owned:String = \"owned\"" `# question_mark_operator` \ + --replace-fail "let mut owned_mut =" "let mut owned_mut: String =" + ''; + postInstall = let wrap = exe: '' @@ -51,6 +69,8 @@ rustPlatform.buildRustPackage rec { lib.makeBinPath [ cargo gcc + mold # fix fatal error: "unknown command line option: -run" + rustc # requires rust edition 2024 ] } \ --set-default RUST_SRC_PATH "$RUST_SRC_PATH" From b6c58863e40a8861bf6c9fc4e42c93fef1fc0225 Mon Sep 17 00:00:00 2001 From: eljamm Date: Sun, 27 Apr 2025 00:38:56 +0200 Subject: [PATCH 17/90] evcxr: add update script --- pkgs/by-name/ev/evcxr/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ev/evcxr/package.nix b/pkgs/by-name/ev/evcxr/package.nix index e00902d7d4e6..707a02fb2302 100644 --- a/pkgs/by-name/ev/evcxr/package.nix +++ b/pkgs/by-name/ev/evcxr/package.nix @@ -11,6 +11,7 @@ rustc, cmake, libiconv, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -82,6 +83,8 @@ rustPlatform.buildRustPackage rec { rm $out/bin/testing_runtime ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Evaluation context for Rust"; homepage = "https://github.com/google/evcxr"; From 687ebf4459dfbd2e278505fc84c3c1cccdd0a93e Mon Sep 17 00:00:00 2001 From: eljamm Date: Sun, 27 Apr 2025 00:39:55 +0200 Subject: [PATCH 18/90] evcxr: small improvements - use finalAttrs - remove `with lib;` - sort deps --- pkgs/by-name/ev/evcxr/package.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ev/evcxr/package.nix b/pkgs/by-name/ev/evcxr/package.nix index 707a02fb2302..3ac0a2963e1e 100644 --- a/pkgs/by-name/ev/evcxr/package.nix +++ b/pkgs/by-name/ev/evcxr/package.nix @@ -1,27 +1,27 @@ { - cargo, + lib, + stdenv, + rustPlatform, fetchFromGitHub, makeWrapper, pkg-config, - rustPlatform, - lib, - stdenv, + cmake, + libiconv, + cargo, gcc, mold, rustc, - cmake, - libiconv, nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "evcxr"; version = "0.19.0"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-8PjZFWUH76QrA8EI9Cx0sBCzocvSmnp84VD7Nv9QMc8="; }; @@ -85,14 +85,14 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Evaluation context for Rust"; homepage = "https://github.com/google/evcxr"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ protoben ma27 ]; mainProgram = "evcxr"; }; -} +}) From 695d683ed21bf95727681577b1740268e287fadd Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 8 May 2025 12:52:04 +0200 Subject: [PATCH 19/90] palemoon-bin: 33.7.0 -> 33.7.1 --- pkgs/applications/networking/browsers/palemoon/bin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index a16e7f6b5e79..5defd3f14dd5 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.7.0"; + version = "33.7.1"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -174,11 +174,11 @@ stdenv.mkDerivation (finalAttrs: { { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-pWqBcYBSRFI67Q4A38qf7KibZQ1vRlDnTEhJJbTw1Yg="; + hash = "sha256-80L93pQaozdyqMnIswWnS+gNo+xVYv5eFVNnLiK/rcU="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-hZhhWIuRu1329VNArT7bsaDqcw/NCopZ5/x5rXVE6y4="; + hash = "sha256-dnDQKRCqADzdotJRUeETqaGV+S+M6/de5LuBgMYYvPE="; }; }; From fb4b83f9b7b7a5d1e1b472951d000f51f6ce5ed3 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Thu, 8 May 2025 18:23:08 +0200 Subject: [PATCH 20/90] SDL_compat: set rpath during installation --- pkgs/by-name/sd/SDL_compat/package.nix | 30 ++++++++++---------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/sd/SDL_compat/package.nix b/pkgs/by-name/sd/SDL_compat/package.nix index 59788c98bbcf..197b0b16598a 100644 --- a/pkgs/by-name/sd/SDL_compat/package.nix +++ b/pkgs/by-name/sd/SDL_compat/package.nix @@ -52,6 +52,17 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals openglSupport [ libGLU ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'set(CMAKE_SKIP_RPATH TRUE)' 'set(CMAKE_SKIP_RPATH FALSE)' + ''; + + dontPatchELF = true; # don't strip rpath + + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_INSTALL_RPATH" (lib.makeLibraryPath [ sdl2-compat ])) + ]; + enableParallelBuilding = true; postInstall = '' @@ -66,25 +77,6 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./find-headers.patch ]; setupHook = ./setup-hook.sh; - postFixup = '' - for lib in $out/lib/*${stdenv.hostPlatform.extensions.sharedLibrary}* ; do - if [[ -L "$lib" ]]; then - ${ - if stdenv.hostPlatform.isDarwin then - '' - install_name_tool ${ - lib.strings.concatMapStrings (x: " -add_rpath ${lib.makeLibraryPath [ x ]} ") finalAttrs.buildInputs - } "$lib" - '' - else - '' - patchelf --set-rpath "$(patchelf --print-rpath $lib):${lib.makeLibraryPath finalAttrs.buildInputs}" "$lib" - '' - } - fi - done - ''; - meta = { homepage = "https://www.libsdl.org/"; description = "Cross-platform multimedia library - build SDL 1.2 applications against 2.0"; From bf1a329f7080dc43f9d162b1efd0635867583ee2 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Thu, 8 May 2025 19:20:13 +0200 Subject: [PATCH 21/90] SDL_compat: add basic checkPhase --- pkgs/by-name/sd/SDL_compat/package.nix | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sd/SDL_compat/package.nix b/pkgs/by-name/sd/SDL_compat/package.nix index 197b0b16598a..cddc638d715d 100644 --- a/pkgs/by-name/sd/SDL_compat/package.nix +++ b/pkgs/by-name/sd/SDL_compat/package.nix @@ -59,12 +59,26 @@ stdenv.mkDerivation (finalAttrs: { dontPatchELF = true; # don't strip rpath - cmakeFlags = [ - (lib.cmakeFeature "CMAKE_INSTALL_RPATH" (lib.makeLibraryPath [ sdl2-compat ])) - ]; + cmakeFlags = + let + rpath = lib.makeLibraryPath [ sdl2-compat ]; + in + [ + (lib.cmakeFeature "CMAKE_INSTALL_RPATH" rpath) + (lib.cmakeFeature "CMAKE_BUILD_RPATH" rpath) + (lib.cmakeBool "SDL12TESTS" finalAttrs.finalPackage.doCheck) + ]; enableParallelBuilding = true; + # Darwin fails with "Critical error: required built-in appearance SystemAppearance not found" + doCheck = !stdenv.hostPlatform.isDarwin; + checkPhase = '' + runHook preCheck + ./testver + runHook postCheck + ''; + postInstall = '' # allow as a drop in replacement for SDL # Can be removed after treewide switch from pkg-config to pkgconf From 69948e3608e3c84860771d554c1d1fb6c8620571 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Thu, 8 May 2025 18:58:04 +0200 Subject: [PATCH 22/90] SDL_compat: add passthru.tests --- pkgs/by-name/sd/SDL_compat/package.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/by-name/sd/SDL_compat/package.nix b/pkgs/by-name/sd/SDL_compat/package.nix index cddc638d715d..683d6eb38c98 100644 --- a/pkgs/by-name/sd/SDL_compat/package.nix +++ b/pkgs/by-name/sd/SDL_compat/package.nix @@ -11,6 +11,12 @@ pkg-config, pkg-config-unwrapped, stdenv, + testers, + dosbox, + SDL_image, + SDL_ttf, + SDL_mixer, + SDL_sound, # Boolean flags libGLSupported ? lib.elem stdenv.hostPlatform.system mesa.meta.platforms, openglSupport ? libGLSupported, @@ -91,6 +97,18 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./find-headers.patch ]; setupHook = ./setup-hook.sh; + passthru.tests = { + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + inherit + SDL_image + SDL_ttf + SDL_mixer + SDL_sound + dosbox + ; + }; + meta = { homepage = "https://www.libsdl.org/"; description = "Cross-platform multimedia library - build SDL 1.2 applications against 2.0"; @@ -99,5 +117,9 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ peterhoeg ]; teams = [ lib.teams.sdl ]; platforms = lib.platforms.all; + pkgConfigModules = [ + "sdl" + "sdl12_compat" + ]; }; }) From d50195cf58e1d81bdffc307a763f36c909988815 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Thu, 8 May 2025 22:06:13 +0200 Subject: [PATCH 23/90] nodejs_24: 24.0.0 -> 24.0.1 --- pkgs/development/web/nodejs/v24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix index 85e78b3b3c77..7d65f2d10c94 100644 --- a/pkgs/development/web/nodejs/v24.nix +++ b/pkgs/development/web/nodejs/v24.nix @@ -17,8 +17,8 @@ let in buildNodejs { inherit enableNpm; - version = "24.0.0"; - sha256 = "914f3f1b03f84a0994d7357f190ff13c038800c693b6c06da2290eb588c82761"; + version = "24.0.1"; + sha256 = "70271026971808409a7ed6444360d5fe3ef4146c1ca53f2ca290c60d214be84e"; patches = ( if (stdenv.hostPlatform.emulatorAvailable buildPackages) then From bd4dd919565205c08aa4b40a2ef2e6a18334e8a3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 May 2025 22:08:55 +0200 Subject: [PATCH 24/90] python313Packages.cyclopts: 3.14.2 -> 3.15.0 Changelog: https://github.com/BrianPugh/cyclopts/releases/tag/v3.15.0 --- .../python-modules/cyclopts/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index 8219db84dc34..5ccc4bbadcf6 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -4,7 +4,6 @@ buildPythonPackage, docstring-parser, fetchFromGitHub, - importlib-metadata, poetry-core, poetry-dynamic-versioning, pydantic, @@ -12,23 +11,23 @@ pytestCheckHook, pythonOlder, pyyaml, - rich, rich-rst, - typing-extensions, + rich, + trio, }: buildPythonPackage rec { pname = "cyclopts"; - version = "3.14.2"; + version = "3.15.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.12"; src = fetchFromGitHub { owner = "BrianPugh"; repo = "cyclopts"; tag = "v${version}"; - hash = "sha256-vQTODRlHktmA+mf9Yy8ab8H+HVlQjK8MZ4XpjLHbozs="; + hash = "sha256-APg6Z1atVgkWy0/Gf30l7XrLZtxevt6Hj4z4ytKiy/0="; }; build-system = [ @@ -39,18 +38,21 @@ buildPythonPackage rec { dependencies = [ attrs docstring-parser - importlib-metadata rich rich-rst - typing-extensions ]; + optional-dependencies = { + trio = [ trio ]; + yaml = [ pyyaml ]; + }; + nativeCheckInputs = [ pydantic pytest-mock pytestCheckHook pyyaml - ]; + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "cyclopts" ]; From 76743fc7a6a03f98dca512c85b765725b77ef087 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 May 2025 22:19:09 +0200 Subject: [PATCH 25/90] python313Packages.model-checker: 0.9.19 -> 0.9.20 --- pkgs/development/python-modules/model-checker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix index 42766f8771f2..63e48787ae25 100644 --- a/pkgs/development/python-modules/model-checker/default.nix +++ b/pkgs/development/python-modules/model-checker/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "model-checker"; - version = "0.9.19"; + version = "0.9.20"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "model_checker"; inherit version; - hash = "sha256-OzK2TqEXujCdpOyS2qo5L8PAv8cfLLbiItD+OkzlyyI="; + hash = "sha256-n5wLf5iZ+pMXpXAy1K+SVC1fszCi0lr9LsqqEn8KU0w="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail From e799850481e6f957ead477e331b4716cae74982c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 May 2025 21:27:20 +0000 Subject: [PATCH 26/90] vscodium: 1.99.32704 -> 1.99.32846 --- pkgs/applications/editors/vscode/vscodium.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index cac34eec585d..de16eb2c5c2d 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -26,11 +26,11 @@ let hash = { - x86_64-linux = "sha256-dAckjPosKsL1ZM2lQNKtxl1jOo/q1lBd1rkbj3G2AVs="; - x86_64-darwin = "sha256-z3U5wBJ72XG/k4HWUaaZm+MMEw4pqtvhejTnFq5fDmQ="; - aarch64-linux = "sha256-ZLbMknKHc6yVZ+fJOGZWh1NeFWMYYCXyNnnPRBMM6R4="; - aarch64-darwin = "sha256-RPL60SMdic8Q5GMtgY5yEoR0dzhnniEaoYKusfPN0Ks="; - armv7l-linux = "sha256-UrLjrBDFfTeSSsrzq4lIAd1lXNssmgrEWKpaweMtVRc="; + x86_64-linux = "sha256-C1v6M3gliVm4iufKjAWNJgiJ2K2cIrIqvYqtsX/fyAQ="; + x86_64-darwin = "sha256-/0uFfMQa78joIQ2CogAddBnXmo4wpnh47Y0glJ7vWJg="; + aarch64-linux = "sha256-v2GLRrvQVFBlTkGi/teA+bpJYJIdZVNmjTS8oXjhF1c="; + aarch64-darwin = "sha256-qFJYQpOCDlwQO7Dy6P1hm/9yE3LACpF6PYOLK1kNzDs="; + armv7l-linux = "sha256-g/fWf17WWtAd8TKbZGWvGGiy0qTicEE9m5bFteLvswo="; } .${system} or throwSystem; @@ -41,7 +41,7 @@ callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.99.32704"; + version = "1.99.32846"; pname = "vscodium"; executableName = "codium"; From b635bc753dd5e644852b77308f7d1608c58795b8 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 9 May 2025 00:04:43 +0200 Subject: [PATCH 27/90] deepsecrets: modernize, enable tests --- pkgs/tools/security/deepsecrets/default.nix | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/deepsecrets/default.nix b/pkgs/tools/security/deepsecrets/default.nix index 6d77a683039d..1238d51b23bc 100644 --- a/pkgs/tools/security/deepsecrets/default.nix +++ b/pkgs/tools/security/deepsecrets/default.nix @@ -22,11 +22,11 @@ python3.pkgs.buildPythonApplication rec { "mmh3" ]; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ poetry-core ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ dotwiz mmh3 ordered-set @@ -40,12 +40,23 @@ python3.pkgs.buildPythonApplication rec { "deepsecrets" ]; - meta = with lib; { + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + disabledTests = [ + # assumes package is built in /app (docker?), and not /build/${src.name} (nix sandbox) + "test_1_cli" + "test_config" + "test_basic_info" + ]; + + meta = { description = "Secrets scanner that understands code"; mainProgram = "deepsecrets"; homepage = "https://github.com/avito-tech/deepsecrets"; changelog = "https://github.com/avito-tech/deepsecrets/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } From 5d29f2439c9db2ce26ea96b16ae9d24a62925fd5 Mon Sep 17 00:00:00 2001 From: SEIAROTg Date: Fri, 9 May 2025 03:26:39 +0100 Subject: [PATCH 28/90] goshs: fix auto updating `gitUpdater` is known not to work well with `vendorHash` [1]. `nixpkgs-update` backed off here as a update script was specified [2], [3], which worked locally once `passthru.updateScript` was removed. [1]: https://wiki.nixos.org/wiki/Nixpkgs/Update_Scripts [2]: https://github.com/nix-community/nixpkgs-update/blob/ebb24cc0d648daaf5af784b368fe7d456bd69ec7/src/Rewrite.hs#L166-L189 [3]: https://nixpkgs-update-logs.nix-community.org/goshs/2025-05-04.log --- pkgs/by-name/go/goshs/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/go/goshs/package.nix b/pkgs/by-name/go/goshs/package.nix index 4e22ec4e92d2..fe05dc857dcf 100644 --- a/pkgs/by-name/go/goshs/package.nix +++ b/pkgs/by-name/go/goshs/package.nix @@ -1,7 +1,6 @@ { buildGoModule, fetchFromGitHub, - gitUpdater, stdenv, versionCheckHook, lib, @@ -33,8 +32,6 @@ buildGoModule (finalAttrs: { "-skip=^TestGetIPv4Addr$" ]; - passthru.updateScript = gitUpdater { rev-prefix = "v"; }; - meta = { description = "Simple, yet feature-rich web server written in Go"; homepage = "https://goshs.de"; From 844024685143bba3923c9c0c9e43cea8a1c4a270 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 May 2025 05:22:54 +0000 Subject: [PATCH 29/90] kanidm-provision: 1.2.0 -> 1.2.1 --- pkgs/by-name/ka/kanidm-provision/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ka/kanidm-provision/package.nix b/pkgs/by-name/ka/kanidm-provision/package.nix index 6cc34970e683..f7a603dba55c 100644 --- a/pkgs/by-name/ka/kanidm-provision/package.nix +++ b/pkgs/by-name/ka/kanidm-provision/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "kanidm-provision"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "oddlama"; repo = "kanidm-provision"; tag = "v${finalAttrs.version}"; - hash = "sha256-+NQJEAJ0DqKEV1cYZN7CLzGoBJNUL3SQAMmxRQG5DMI="; + hash = "sha256-kwxGrLz59Zk8PSsfQzPUeA/xWQZrV1NWlS5/yuqfIyI="; }; postPatch = '' From b8661fc4cb266618ea49f143f945e078476db6e1 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Fri, 9 May 2025 13:14:03 +0800 Subject: [PATCH 30/90] cpp-netlib: pin Boost to 1.86; LLVM to 18 on Darwin --- .../0001-Compatibility-with-boost-1.83.patch | 33 +++++++++++++++++++ pkgs/by-name/cp/cpp-netlib/package.nix | 18 +++++++--- 2 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 pkgs/by-name/cp/cpp-netlib/0001-Compatibility-with-boost-1.83.patch diff --git a/pkgs/by-name/cp/cpp-netlib/0001-Compatibility-with-boost-1.83.patch b/pkgs/by-name/cp/cpp-netlib/0001-Compatibility-with-boost-1.83.patch new file mode 100644 index 000000000000..2c860aaba4f7 --- /dev/null +++ b/pkgs/by-name/cp/cpp-netlib/0001-Compatibility-with-boost-1.83.patch @@ -0,0 +1,33 @@ +From 8be99f5972826c25378bccb9fbd7291623c7b2a7 Mon Sep 17 00:00:00 2001 +From: Moraxyc +Date: Fri, 9 May 2025 13:39:17 +0800 +Subject: [PATCH] Compatibility with boost 1.83 + +--- + boost/network/protocol/http/server/impl/parsers.ipp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/boost/network/protocol/http/server/impl/parsers.ipp b/boost/network/protocol/http/server/impl/parsers.ipp +index c31e60e..3272c2f 100755 +--- a/boost/network/protocol/http/server/impl/parsers.ipp ++++ b/boost/network/protocol/http/server/impl/parsers.ipp +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #ifdef BOOST_NETWORK_NO_LIB + #ifndef BOOST_NETWORK_INLINE +@@ -32,7 +33,7 @@ typedef std::basic_string u32_string; + template <> // + struct assign_to_container_from_value { + static void call(u32_string const& val, std::string& attr) { +- u32_to_u8_iterator begin = val.begin(), ++ boost::u32_to_u8_iterator begin = val.begin(), + end = val.end(); + for (; begin != end; ++begin) attr += *begin; + } +-- +2.48.1 + diff --git a/pkgs/by-name/cp/cpp-netlib/package.nix b/pkgs/by-name/cp/cpp-netlib/package.nix index decceeb7a845..466884fbbd33 100644 --- a/pkgs/by-name/cp/cpp-netlib/package.nix +++ b/pkgs/by-name/cp/cpp-netlib/package.nix @@ -3,11 +3,15 @@ stdenv, fetchFromGitHub, cmake, - boost181, + boost186, openssl, + llvmPackages_18, }: - -stdenv.mkDerivation rec { +let + # std::char_traits has been removed + stdenvForCppNetlib = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv; +in +stdenvForCppNetlib.mkDerivation rec { pname = "cpp-netlib"; version = "0.13.0-final"; @@ -19,9 +23,15 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # 'u32_to_u8_iterator' was not declared + ./0001-Compatibility-with-boost-1.83.patch + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ - boost181 + # io_service.hpp has been removed in boost 1.87+ + boost186 openssl ]; From c0c0c0f4fa03ea368f2a05bebb253410766eaaf0 Mon Sep 17 00:00:00 2001 From: Kristian Krsnik Date: Fri, 9 May 2025 17:59:37 +0200 Subject: [PATCH 31/90] balatro: 1.0.1n -> 1.0.1o Additionally made the source file overridable. --- pkgs/by-name/ba/balatro/package.nix | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ba/balatro/package.nix b/pkgs/by-name/ba/balatro/package.nix index 181cd305411b..526ca9ee051f 100644 --- a/pkgs/by-name/ba/balatro/package.nix +++ b/pkgs/by-name/ba/balatro/package.nix @@ -11,18 +11,17 @@ withMods ? true, withLinuxPatch ? true, }: -let - version = "1.0.1n"; - balatroExe = requireFile { - name = "Balatro-${version}.exe"; +stdenv.mkDerivation (finalAttrs: { + pname = "balatro"; + version = "1.0.1o"; + + src = requireFile { + name = "Balatro-${finalAttrs.version}.exe"; url = "https://store.steampowered.com/app/2379780/Balatro/"; # Use `nix hash file --sri --type sha256` to get the correct hash - hash = "sha256-mJ5pL+Qj3+ldOLFcQc64dM0edTeQSePIYpp5EuwxKXo="; + hash = "sha256-DXX+FkrM8zEnNNSzesmHiN0V8Ljk+buLf5DE5Z3pP0c="; }; -in -stdenv.mkDerivation { - pname = "balatro"; - inherit version; + nativeBuildInputs = [ p7zip copyDesktopItems @@ -43,7 +42,7 @@ stdenv.mkDerivation { buildPhase = '' runHook preBuild tmpdir=$(mktemp -d) - 7z x ${balatroExe} -o$tmpdir -y + 7z x ${finalAttrs.src} -o$tmpdir -y ${if withLinuxPatch then "patch $tmpdir/globals.lua -i ${./globals.patch}" else ""} patchedExe=$(mktemp -u).zip 7z a $patchedExe $tmpdir/* @@ -76,4 +75,4 @@ stdenv.mkDerivation { platforms = love.meta.platforms; mainProgram = "balatro"; }; -} +}) From c3c3e5dd79569f3147848b52e6a391fdc2ec8a27 Mon Sep 17 00:00:00 2001 From: "[Assassin]" Date: Fri, 9 May 2025 15:23:43 +0200 Subject: [PATCH 32/90] vrcx: 2025.03.01 -> 2025.05.09 --- pkgs/by-name/vr/vrcx/deps.json | 90 +++++++++++++++++++++++++------- pkgs/by-name/vr/vrcx/package.nix | 14 +++-- 2 files changed, 76 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/vr/vrcx/deps.json b/pkgs/by-name/vr/vrcx/deps.json index bab0850a0623..a65e6cabd866 100644 --- a/pkgs/by-name/vr/vrcx/deps.json +++ b/pkgs/by-name/vr/vrcx/deps.json @@ -51,13 +51,13 @@ }, { "pname": "Microsoft.JavaScript.NodeApi", - "version": "0.9.5", - "hash": "sha256-IJjCix/X0rh+3Fc7eVxKyk0P/Ex5ItlAM4ugTG7OYo4=" + "version": "0.9.11", + "hash": "sha256-1F2lG7ePVKy9QXMt76AWf64zj5o9upVik3//AqPaw7U=" }, { "pname": "Microsoft.JavaScript.NodeApi.Generator", - "version": "0.9.5", - "hash": "sha256-Me3fsW0tc00O8bCcItEjLvm2Tik6Xbc7FPBddaLim8w=" + "version": "0.9.11", + "hash": "sha256-WAunMB3ksE0trHmohr+fTxGXiYNd553PUJoDaOSmLxo=" }, { "pname": "Microsoft.NETCore.Platforms", @@ -116,8 +116,8 @@ }, { "pname": "Microsoft.Win32.SystemEvents", - "version": "9.0.2", - "hash": "sha256-WXgu8y2LT8OtQSVRojumtlTkJVjfvXeZ8N9iRKIW/lI=" + "version": "9.0.4", + "hash": "sha256-vWObhv9e/nPVaMkEYb4lTlMmX/v4fluVWuHAtxYrUIQ=" }, { "pname": "NETStandard.Library", @@ -369,6 +369,41 @@ "version": "4.4.0", "hash": "sha256-jPnWzDcbufO51GLGjynWHy0b+5PBqNxM+VKmSrObeUw=" }, + { + "pname": "runtime.win.Microsoft.Win32.Primitives", + "version": "4.3.0", + "hash": "sha256-ZnzR82+YDpNYf1GICTbzPjB20AjSy8dlRhfocK1FMEw=" + }, + { + "pname": "runtime.win.System.Console", + "version": "4.3.1", + "hash": "sha256-xhkY/NXkqEv2bieaeD9M2HxB48qDBz/XrD5FS6xm1MI=" + }, + { + "pname": "runtime.win.System.Diagnostics.Debug", + "version": "4.3.0", + "hash": "sha256-DpU+PGIUCtaK6gQEl/OWSO/JKg/TA9yeD01Zzxaxy5k=" + }, + { + "pname": "runtime.win.System.IO.FileSystem", + "version": "4.3.0", + "hash": "sha256-6JnGF9kj6jYd9xneKQdTvb3zNTSHdeWW/pr7vui0AbA=" + }, + { + "pname": "runtime.win.System.Net.Primitives", + "version": "4.3.0", + "hash": "sha256-jqUpP60h/kkampLU9Bt8T5gSDaVXwxPsOOTEVVKAPbY=" + }, + { + "pname": "runtime.win.System.Net.Sockets", + "version": "4.3.0", + "hash": "sha256-k2lTk08ryI2NSEI3IFlO0y2cltiT8TIhNnqHgeL8I1M=" + }, + { + "pname": "runtime.win.System.Runtime.Extensions", + "version": "4.3.0", + "hash": "sha256-+TMflNyjP+Lf5bge0xVN5AKxMAk4/caWY6zZrqtyAJw=" + }, { "pname": "SharpDX", "version": "4.2.0", @@ -391,18 +426,18 @@ }, { "pname": "SixLabors.Fonts", - "version": "2.0.8", - "hash": "sha256-ujiUYbg/uHYjJsLuljwK0kdaQHzrceZ+W6jgjCpv5LE=" + "version": "2.1.3", + "hash": "sha256-lUTFK7OBtiXU1gyROax4GXDRvNj3aqgGlZZvicc37VQ=" }, { "pname": "SixLabors.ImageSharp", - "version": "3.1.6", - "hash": "sha256-FQjLyC4158F1GyhlKjzjGo6TxAu698rYWTY9lkko/fA=" + "version": "3.1.8", + "hash": "sha256-cE9BQfbCvJ0Mf+fQiTD8elOZEPcfZHjDz2BHdiO+D08=" }, { "pname": "SixLabors.ImageSharp.Drawing", - "version": "2.1.5", - "hash": "sha256-n54bDQpp5i2V4LgMXuuq/bHHs6/7PyK8eSx0vJ2NHbA=" + "version": "2.1.6", + "hash": "sha256-2VYoBw8XidjqFUS03EgxOq9vw/WRZjhF3z1pwfaSzUc=" }, { "pname": "sqlite-net-pcl", @@ -451,8 +486,8 @@ }, { "pname": "System.CodeDom", - "version": "9.0.2", - "hash": "sha256-hNhCSyuD9/teTgFuX4zrBn/LWlijczwrMqv+r3/yfHI=" + "version": "9.0.4", + "hash": "sha256-X8IDHw/ssp0vgPSnyM/tmDTb3poH6GLe+gZ4MR9qfho=" }, { "pname": "System.Collections", @@ -536,8 +571,8 @@ }, { "pname": "System.Drawing.Common", - "version": "9.0.2", - "hash": "sha256-S7IMV4R/nWbZs/YCwI9UwwLHDP57NkfSEIaoYNbRq54=" + "version": "9.0.4", + "hash": "sha256-taudg5yVeaNrgvD9LMEumByKE0G032jp9s9AGfKYI9A=" }, { "pname": "System.Globalization", @@ -591,8 +626,8 @@ }, { "pname": "System.Management", - "version": "9.0.2", - "hash": "sha256-7FhGnAYgoJnPcHy+HbVdK/fD8ICSLAttLtueTLBoWZc=" + "version": "9.0.4", + "hash": "sha256-+sW/NQELaBGjUfzndaNLPHKKQVdI1yOJMaqF4tV2SVY=" }, { "pname": "System.Memory", @@ -759,6 +794,11 @@ "version": "4.7.0", "hash": "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g=" }, + { + "pname": "System.Security.Claims", + "version": "4.3.0", + "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks=" + }, { "pname": "System.Security.Cryptography.Algorithms", "version": "4.3.0", @@ -804,6 +844,11 @@ "version": "4.7.0", "hash": "sha256-BGgXMLUi5rxVmmChjIhcXUxisJjvlNToXlyaIbUxw40=" }, + { + "pname": "System.Security.Principal", + "version": "4.3.0", + "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=" + }, { "pname": "System.Security.Principal.Windows", "version": "4.3.0", @@ -836,8 +881,8 @@ }, { "pname": "System.Text.Json", - "version": "9.0.2", - "hash": "sha256-kftKUuGgZtF4APmp77U79ws76mEIi+R9+DSVGikA5y8=" + "version": "9.0.4", + "hash": "sha256-oIOqfOIIUXXVkfFiTCI9wwIJBETQqF7ZcOJv2iYuq1s=" }, { "pname": "System.Text.RegularExpressions", @@ -859,6 +904,11 @@ "version": "8.0.0", "hash": "sha256-c5TYoLNXDLroLIPnlfyMHk7nZ70QAckc/c7V199YChg=" }, + { + "pname": "System.Threading.Overlapped", + "version": "4.3.0", + "hash": "sha256-tUX099CChkqWiHyP/1e4jGYzZAjgIthMOdMmiOGMUNk=" + }, { "pname": "System.Threading.Tasks", "version": "4.3.0", diff --git a/pkgs/by-name/vr/vrcx/package.nix b/pkgs/by-name/vr/vrcx/package.nix index e1c651982fdf..0e7be5909138 100644 --- a/pkgs/by-name/vr/vrcx/package.nix +++ b/pkgs/by-name/vr/vrcx/package.nix @@ -4,7 +4,7 @@ buildDotnetModule, dotnetCorePackages, buildNpmPackage, - electron_34, + electron_35, makeWrapper, copyDesktopItems, makeDesktopItem, @@ -12,17 +12,15 @@ }: let pname = "vrcx"; - version = "2025.03.01"; + version = "2025.05.09"; dotnet = dotnetCorePackages.dotnet_9; - electron = electron_34; + electron = electron_35; src = fetchFromGitHub { owner = "vrcx-team"; repo = "VRCX"; - # v2025.03.01 tag is actually behind a few commits, namely the one that bumps the version (so it complains about not being up-to-date) - #tag = "v${version}"; - rev = "1980eeb4cccebfcf33826d44b7833a9aa6f5a955"; - hash = "sha256-HiFcHnytynWYbeUd+KsG38dLU1FhDu0VD3JPT3kUO6s="; + tag = "v${version}"; + hash = "sha256-sqdDucjERHC5YykisFDiBOJw40snsldBcuCH1FAahSo="; }; backend = buildDotnetModule { @@ -47,7 +45,7 @@ in buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-2ZU+9NPPx3GbU75XfjVroZCpjXr7IK2HtEIqLJLOjyw="; + npmDepsHash = "sha256-sXWKsW9vPyq1oK9ysJod3uAUOICsK/TBLbSekT1SO+k="; npmFlags = [ "--ignore-scripts" ]; makeCacheWritable = true; From ac89effaa30f705e1b934786f389095bec02ee7a Mon Sep 17 00:00:00 2001 From: Bence Madarasz Date: Fri, 9 May 2025 18:29:10 +0200 Subject: [PATCH 33/90] gftp: workaround incompatible pointer types --- pkgs/by-name/gf/gftp/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/gf/gftp/package.nix b/pkgs/by-name/gf/gftp/package.nix index 9f6a1f4fb2f8..4d7db1e79dc8 100644 --- a/pkgs/by-name/gf/gftp/package.nix +++ b/pkgs/by-name/gf/gftp/package.nix @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { hash = "sha256-0zdv2oYl24BXh61IGCWby/2CCkzNjLpDrAFc0J89Pw4="; }; + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-incompatible-pointer-types" # https://github.com/masneyb/gftp/issues/178 + ]; + nativeBuildInputs = [ autoconf automake From 53f83c2166e6582dd575a0b34ac921410d991f25 Mon Sep 17 00:00:00 2001 From: Rasmus Rendal Date: Fri, 9 May 2025 19:08:53 +0200 Subject: [PATCH 34/90] canto-curses: Fix build failure using patch from arch --- pkgs/by-name/ca/canto-curses/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/ca/canto-curses/package.nix b/pkgs/by-name/ca/canto-curses/package.nix index 78be4ecaeb2d..69e02fac6472 100644 --- a/pkgs/by-name/ca/canto-curses/package.nix +++ b/pkgs/by-name/ca/canto-curses/package.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + fetchurl, python3Packages, readline, ncurses, @@ -18,6 +19,14 @@ python3Packages.buildPythonApplication rec { sha256 = "1vzb9n1j4gxigzll6654ln79lzbrrm6yy0lyazd9kldyl349b8sr"; }; + # Fixes the issue found here https://github.com/themoken/canto-curses/issues/59 + patches = [ + (fetchurl { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/canto-curses/-/raw/6daa56bc5baebb2444c368a8208666ef484a6fc0/fix-build.patch"; + hash = "sha256-2TMNmwjUAGyenSDqxfI+U2hNeDZaj2CivfTfpX7CKgY="; + }) + ]; + buildInputs = [ readline ncurses From ddd9e7e8c538e8ec2088cd68ac56747edda3a1f3 Mon Sep 17 00:00:00 2001 From: Georgy Charkseliani Date: Fri, 9 May 2025 19:46:55 +0200 Subject: [PATCH 35/90] proxmoxer: fix failing tests --- pkgs/development/python-modules/proxmoxer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/proxmoxer/default.nix b/pkgs/development/python-modules/proxmoxer/default.nix index 957d3ce1aab3..5ef1b6dc00f5 100644 --- a/pkgs/development/python-modules/proxmoxer/default.nix +++ b/pkgs/development/python-modules/proxmoxer/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "proxmoxer"; - version = "2.2.0"; + version = "develop"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "proxmoxer"; repo = "proxmoxer"; - tag = version; - hash = "sha256-56PccWOZiYLPSaJrFfOqP9kTuHqqhgiF1DpnNgFSabI="; + rev = "cf1bcde696537c74ef00d8e71fb86735fb4c2c79"; + hash = "sha256-h5Sla7/4XiZSGwKstyiqs/T2Qgi13jI9YMVPqDcF3sA="; }; build-system = [ setuptools ]; From c443bc6620f55a4c797b4cd5bbe1facdf7136e59 Mon Sep 17 00:00:00 2001 From: Rasmus Rendal Date: Fri, 9 May 2025 19:55:28 +0200 Subject: [PATCH 36/90] alliance: Switch to GitHub repository, update to 2025 This is the source repository referenced by their website described in meta. Also, remove some flags that have become unnecessary, add a new one that has --- pkgs/by-name/al/alliance/package.nix | 33 +++++++++++++--------------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/al/alliance/package.nix b/pkgs/by-name/al/alliance/package.nix index 726c25a932e9..1b6ab31d2318 100644 --- a/pkgs/by-name/al/alliance/package.nix +++ b/pkgs/by-name/al/alliance/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitLab, + fetchFromGitHub, xorgproto, motif, libX11, @@ -16,17 +16,18 @@ stdenv.mkDerivation { pname = "alliance"; - version = "unstable-2022-01-13"; + version = "unstable-2025-02-24"; - src = fetchFromGitLab { - domain = "gitlab.lip6.fr"; - owner = "vlsi-eda"; - repo = "alliance"; - rev = "ebece102e15c110fc79f1da50524c68fd9523f0c"; - hash = "sha256-NGtE3ZmN9LrgXG4NIKrp7dFRVzrKMoudlPUtYYKrZjY="; - }; - - prePatch = "cd alliance/src"; + src = + let + src = fetchFromGitHub { + owner = "lip6"; + repo = "alliance"; + rev = "a8502d32df0a4ad1bd29ab784c4332319669ecd2"; + hash = "sha256-b2uaYZEzHMB3qCMRVANNnjTxr6OYb1Unswxjq5knYzM="; + }; + in + "${src}/alliance/src"; nativeBuildInputs = [ libtool @@ -43,17 +44,13 @@ stdenv.mkDerivation { bison ]; - # Disable parallel build, errors: - # ./pat_decl_y.y:736:5: error: expected '=', ... - enableParallelBuilding = false; - - ALLIANCE_TOP = placeholder "out"; - configureFlags = [ - "--prefix=${placeholder "out"}" "--enable-alc-shared" ]; + # To avoid compiler error in LoadDataBase.c:366:27 + env.NIX_CFLAGS_COMPILE = "-Wno-incompatible-pointer-types"; + postPatch = '' # texlive for docs seems extreme substituteInPlace autostuff \ From ba4fe10465e752d701e44bb8c5a8fc670b3845a1 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 9 May 2025 20:56:58 +0200 Subject: [PATCH 37/90] workflows/editorconfig: drop and move to treefmt We already have treefmt running for nixfmt, so it's easy to just add another formatter to it. This gives a much better UX, because all formatting errors are reported through the same channel. It also saves us one CI job, which takes most of the time to just set up the machine, clone the repo and download Nix - while doing a minimum of actual work. Total execution time for treefmt is ~10% slower: - 38s only nixfmt - 43s nixfmt + editorconfig-checker --- ...{check-nix-format.yml => check-format.yml} | 11 ++-- .github/workflows/editorconfig-v2.yml | 52 ------------------- ci/OWNERS | 2 +- ci/default.nix | 7 +++ 4 files changed, 12 insertions(+), 60 deletions(-) rename .github/workflows/{check-nix-format.yml => check-format.yml} (80%) delete mode 100644 .github/workflows/editorconfig-v2.yml diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-format.yml similarity index 80% rename from .github/workflows/check-nix-format.yml rename to .github/workflows/check-format.yml index 8c35196e4944..ca3da602575b 100644 --- a/.github/workflows/check-nix-format.yml +++ b/.github/workflows/check-format.yml @@ -1,7 +1,4 @@ -# NOTE: Formatting with the RFC-style nixfmt command is not yet stable. -# See https://github.com/NixOS/rfcs/pull/166. - -name: Check that Nix files are formatted +name: Check that files are formatted on: pull_request_target: @@ -14,7 +11,7 @@ jobs: uses: ./.github/workflows/get-merge-commit.yml nixos: - name: nixfmt-check + name: fmt-check runs-on: ubuntu-24.04 needs: get-merge-commit if: needs.get-merge-commit.outputs.mergedSha @@ -27,13 +24,13 @@ jobs: with: extra_nix_config: sandbox = true - - name: Check that Nix files are formatted + - name: Check that files are formatted run: | # Note that it's fine to run this on untrusted code because: # - There's no secrets accessible here # - The build is sandboxed if ! nix-build ci -A fmt.check; then - echo "Some Nix files are not properly formatted" + echo "Some files are not properly formatted" echo "Please format them by going to the Nixpkgs root directory and running one of:" echo " nix-shell --run treefmt" echo " nix develop --command treefmt" diff --git a/.github/workflows/editorconfig-v2.yml b/.github/workflows/editorconfig-v2.yml deleted file mode 100644 index 68d780f2190f..000000000000 --- a/.github/workflows/editorconfig-v2.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: "Checking EditorConfig v2" - -on: - pull_request_target: - -permissions: {} - -jobs: - get-merge-commit: - uses: ./.github/workflows/get-merge-commit.yml - - tests: - name: editorconfig-check - runs-on: ubuntu-24.04 - needs: get-merge-commit - if: "needs.get-merge-commit.outputs.mergedSha && !contains(github.event.pull_request.title, '[skip treewide]')" - steps: - - name: Get list of changed files from PR - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - gh api \ - repos/${{ github.repository }}/pulls/${{ github.event.number }}/files --paginate \ - | jq '.[] | select(.status != "removed") | .filename' \ - > "$HOME/changed_files" - - - name: print list of changed files - run: | - cat "$HOME/changed_files" - - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ needs.get-merge-commit.outputs.mergedSha }} - - - name: Get Nixpkgs revision for editorconfig-checker - run: | - # Pin to a commit from nixpkgs-unstable to avoid building from e.g. staging. - # This should not be a URL, because it would allow PRs to run arbitrary code in CI! - rev=$(jq -r .rev ci/pinned-nixpkgs.json) - echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV" - - - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 - with: - nix_path: nixpkgs=${{ env.url }} - - - name: Checking EditorConfig - run: | - < "$HOME/changed_files" nix-shell -p editorconfig-checker --run 'xargs -r editorconfig-checker -disable-indent-size' - - - if: ${{ failure() }} - run: | - echo "::error :: Hey! It looks like your changes don't follow our editorconfig settings. Read https://editorconfig.org/#download to configure your editor so you never see this error again." diff --git a/ci/OWNERS b/ci/OWNERS index 13b5c0ac4f0a..69a122d537e7 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -16,7 +16,7 @@ # CI /.github/*_TEMPLATE* @SigmaSquadron /.github/workflows @NixOS/Security @Mic92 @zowoq @infinisil @azuwis @wolfgangwalther -/.github/workflows/check-nix-format.yml @infinisil @wolfgangwalther +/.github/workflows/check-format.yml @infinisil @wolfgangwalther /.github/workflows/codeowners-v2.yml @infinisil @wolfgangwalther /.github/workflows/nixpkgs-vet.yml @infinisil @philiptaron @wolfgangwalther /ci @infinisil @philiptaron @NixOS/Security @wolfgangwalther diff --git a/ci/default.nix b/ci/default.nix index 67f59d61bfd4..59fb1b48574c 100644 --- a/ci/default.nix +++ b/ci/default.nix @@ -48,6 +48,13 @@ let # the default formatter for Nix code. # See https://github.com/NixOS/nixfmt programs.nixfmt.enable = true; + + settings.formatter.editorconfig-checker = { + command = "${pkgs.lib.getExe pkgs.editorconfig-checker}"; + options = [ "-disable-indent-size" ]; + includes = [ "*" ]; + priority = 1; + }; }; fs = pkgs.lib.fileset; nixFilesSrc = fs.toSource { From 1cb7a384e022733ba8c1387a9aef9ad382c86394 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 9 May 2025 21:54:12 +0200 Subject: [PATCH 38/90] workflows/keep-sorted: drop and move to treefmt Same reasoning as the commit before, but keep-sorted has even less overhead than editorconfig-checker. Benchmark has it at 1 second per run. --- .github/workflows/keep-sorted.yml | 41 ------------------------------- ci/default.nix | 2 ++ 2 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 .github/workflows/keep-sorted.yml diff --git a/.github/workflows/keep-sorted.yml b/.github/workflows/keep-sorted.yml deleted file mode 100644 index ec2237f52bd9..000000000000 --- a/.github/workflows/keep-sorted.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: Check that files are sorted - -on: - pull_request_target: - types: [opened, synchronize, reopened] - -permissions: {} - -jobs: - get-merge-commit: - uses: ./.github/workflows/get-merge-commit.yml - - nixos: - name: keep-sorted - runs-on: ubuntu-24.04 - needs: get-merge-commit - if: "needs.get-merge-commit.outputs.mergedSha && !contains(github.event.pull_request.title, '[skip treewide]')" - steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: ${{ needs.get-merge-commit.outputs.mergedSha }} - - - name: Get Nixpkgs revision for keep-sorted - run: | - # Pin to a commit from nixpkgs-unstable to avoid e.g. building nixfmt from staging. - # This should not be a URL, because it would allow PRs to run arbitrary code in CI! - rev=$(jq -r .rev ci/pinned-nixpkgs.json) - echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV" - - - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 - with: - extra_nix_config: sandbox = true - nix_path: nixpkgs=${{ env.url }} - - - name: Install keep-sorted - run: "nix-env -f '' -iAP keep-sorted jq" - - - name: Check that Nix files are sorted - shell: bash - run: | - git ls-files | xargs keep-sorted --mode lint | jq --raw-output '.[] | "Please make sure any new entries in \(.path) are sorted alphabetically."' diff --git a/ci/default.nix b/ci/default.nix index 59fb1b48574c..9d0fff7d119a 100644 --- a/ci/default.nix +++ b/ci/default.nix @@ -44,6 +44,8 @@ let # By default it's info, which is too noisy since we have many unmatched files settings.on-unmatched = "debug"; + programs.keep-sorted.enable = true; + # This uses nixfmt-rfc-style underneath, # the default formatter for Nix code. # See https://github.com/NixOS/nixfmt From 60450491f9f3ff10a0d0f4e597091d3c13f7ca4a Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 9 May 2025 21:59:49 +0200 Subject: [PATCH 39/90] workflows/check-nixf-tidy: drop The workflow has been disabled for 9 months. Except for the Eval workflow, this is the most complex, yet unused, workflow. As discussed in #332695, this needs a proper wrapper first. Chances are high, that once a good CLI tool is available, the workflow would be implemented entirely different: We could easily run it via treefmt as well, so that we get the same results locally as in CI. --- .github/workflows/check-nixf-tidy.yml | 132 -------------------------- 1 file changed, 132 deletions(-) delete mode 100644 .github/workflows/check-nixf-tidy.yml diff --git a/.github/workflows/check-nixf-tidy.yml b/.github/workflows/check-nixf-tidy.yml deleted file mode 100644 index 1bb43c746bc5..000000000000 --- a/.github/workflows/check-nixf-tidy.yml +++ /dev/null @@ -1,132 +0,0 @@ -name: Check changed Nix files with nixf-tidy (experimental) - -on: - pull_request_target: - types: [opened, synchronize, reopened, edited] - -permissions: {} - -jobs: - nixos: - name: exp-nixf-tidy-check - runs-on: ubuntu-24.04 - if: "!contains(github.event.pull_request.title, '[skip treewide]')" - steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - ref: refs/pull/${{ github.event.pull_request.number }}/merge - # Fetches the merge commit and its parents - fetch-depth: 2 - - - name: Checking out target branch - run: | - target=$(mktemp -d) - targetRev=$(git rev-parse HEAD^1) - git worktree add "$target" "$targetRev" - echo "targetRev=$targetRev" >> "$GITHUB_ENV" - echo "target=$target" >> "$GITHUB_ENV" - - - name: Get Nixpkgs revision for nixf - run: | - # pin to a commit from nixpkgs-unstable to avoid e.g. building nixf - # from staging - # This should not be a URL, because it would allow PRs to run arbitrary code in CI! - rev=$(jq -r .rev ci/pinned-nixpkgs.json) - echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV" - - - uses: cachix/install-nix-action@526118121621777ccd86f79b04685a9319637641 # v31 - with: - extra_nix_config: sandbox = true - nix_path: nixpkgs=${{ env.url }} - - - name: Install nixf and jq - # provided jq is incompatible with our expression - run: "nix-env -f '' -iAP nixf jq" - - - name: Check that Nix files pass nixf-tidy - run: | - # Filtering error messages we don't like - nixf_wrapper(){ - nixf-tidy --variable-lookup < "$1" | jq -r ' - [ - "sema-escaping-with" - ] - as $ignored_errors|[.[]|select(.sname as $s|$ignored_errors|index($s)|not)] - ' - } - - failedFiles=() - - # Don't report errors to file overview - # to avoid duplicates when editing title and description - if [[ "${{ github.event.action }}" == 'edited' ]] && [[ -z "${{ github.event.edited.changes.base }}" ]]; then - DONT_REPORT_ERROR=1 - else - DONT_REPORT_ERROR= - fi - # TODO: Make this more parallel - - # Loop through all Nix files touched by the PR - while readarray -d '' -n 2 entry && (( ${#entry[@]} != 0 )); do - type=${entry[0]} - file=${entry[1]} - case $type in - A*) - source="" - dest=$file - ;; - M*) - source=$file - dest=$file - ;; - C*|R*) - source=$file - read -r -d '' dest - ;; - *) - echo "Ignoring file $file with type $type" - continue - esac - - if [[ -n "$source" ]] && [[ "$(nixf_wrapper ${{ env.target }}/"$source")" != '[]' ]] 2>/dev/null; then - echo "Ignoring file $file because it doesn't pass nixf-tidy in the target commit" - echo # insert blank line - else - nixf_report="$(nixf_wrapper "$dest")" - if [[ "$nixf_report" != '[]' ]]; then - echo "$dest doesn't pass nixf-tidy. Reported by nixf-tidy:" - errors=$(echo "$nixf_report" | jq -r --arg dest "$dest" ' - def getLCur: "line=" + (.line+1|tostring) + ",col=" + (.column|tostring); - def getRCur: "endLine=" + (.line+1|tostring) + ",endColumn=" + (.column|tostring); - def getRange: "file=\($dest)," + (.lCur|getLCur) + "," + (.rCur|getRCur); - def getBody: . as $top|(.range|getRange) + ",title="+ .sname + "::" + - (.message|sub("{}" ; ($top.args.[]|tostring))); - def getNote: "\n::notice " + (.|getBody); - def getMessage: "::error " + (.|getBody) + (if (.notes|length)>0 then - ([.notes.[]|getNote]|add) else "" end); - .[]|getMessage - ') - if [[ -z "$DONT_REPORT_ERROR" ]]; then - echo "$errors" - else - # just print in plain text - echo "${errors/::/}" - echo # add one empty line - fi - failedFiles+=("$dest") - fi - fi - done < <(git diff -z --name-status ${{ env.targetRev }} -- '*.nix') - - if [[ -n "$DONT_REPORT_ERROR" ]]; then - echo "Edited the PR but didn't change the base branch, only the description/title." - echo "Not reporting errors again to avoid duplication." - echo # add one empty line - fi - - if (( "${#failedFiles[@]}" > 0 )); then - echo "Some new/changed Nix files don't pass nixf-tidy." - echo "See ${{ github.event.pull_request.html_url }}/files for reported errors." - echo "If you believe this is a false positive, ping @Aleksanaa and @inclyc in this PR." - exit 1 - fi From 1748920bc36e14cd494ca4edf7852b1692a04360 Mon Sep 17 00:00:00 2001 From: Georgy Charkseliani Date: Fri, 9 May 2025 22:36:56 +0200 Subject: [PATCH 40/90] proxmoxer: 2.2.0 -> 2.2.0-unstable-2025-02-18 --- pkgs/development/python-modules/proxmoxer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/proxmoxer/default.nix b/pkgs/development/python-modules/proxmoxer/default.nix index 5ef1b6dc00f5..2b3abbe28352 100644 --- a/pkgs/development/python-modules/proxmoxer/default.nix +++ b/pkgs/development/python-modules/proxmoxer/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "proxmoxer"; - version = "develop"; + version = "2.2.0-unstable-2025-02-18"; pyproject = true; disabled = pythonOlder "3.7"; From ca250b2e9d44ee4f9fd4f04423d36a0c42b0c33d Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 10 May 2025 00:24:50 +0200 Subject: [PATCH 41/90] slang: disable pcre module Both Debian [1] and Fedora [2] did this change a while ago. `pcre` 1.x is deprecated and should not be used. [1] https://salsa.debian.org/debian/slang2/-/commit/8d9223409e45b5aee65e7278635daa1fcc880429 [2] https://src.fedoraproject.org/rpms/slang/blob/rawhide/f/slang.spec#_124 --- pkgs/by-name/sl/slang/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/sl/slang/package.nix b/pkgs/by-name/sl/slang/package.nix index aa21473271cf..a72855654ceb 100644 --- a/pkgs/by-name/sl/slang/package.nix +++ b/pkgs/by-name/sl/slang/package.nix @@ -5,7 +5,6 @@ libiconv, libpng, ncurses, - pcre, readline, zlib, writeScript, @@ -36,7 +35,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-pcre=${pcre.dev}" + "--without-pcre" "--with-png=${libpng.dev}" "--with-readline=${readline.dev}" "--with-z=${zlib.dev}" @@ -44,7 +43,6 @@ stdenv.mkDerivation rec { buildInputs = [ libpng - pcre readline zlib ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ libiconv ]; From 78b41f226da707e9b7ff97be5b98cca0d2f1d483 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 May 2025 00:20:26 +0000 Subject: [PATCH 42/90] python3Packages.oras: 0.2.29 -> 0.2.31 --- pkgs/development/python-modules/oras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oras/default.nix b/pkgs/development/python-modules/oras/default.nix index d3ad961a3c10..1834e02ce343 100644 --- a/pkgs/development/python-modules/oras/default.nix +++ b/pkgs/development/python-modules/oras/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "oras"; - version = "0.2.29"; + version = "0.2.31"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "oras-project"; repo = "oras-py"; tag = version; - hash = "sha256-+31DTtUie+Ve5H3jx/8AFzJ5YHPQzOKN3+fq2ujtj28="; + hash = "sha256-8dew0GtVYFHwm/M4yIkJqqVaC1PURn5Pn3fPf7vWQzk="; }; build-system = [ setuptools ]; From 1f2151d43786845c768ffc01543639acaecff4ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 May 2025 00:44:19 +0000 Subject: [PATCH 43/90] python3Packages.json-schema-for-humans: 1.3.4 -> 1.4.1 --- .../python-modules/json-schema-for-humans/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index cc36014395a7..4f9f2087118d 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "1.3.4"; + version = "1.4.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "coveooss"; repo = "json-schema-for-humans"; tag = "v${version}"; - hash = "sha256-+IvLFejEcu477BNY8F0h4WLqe18f6i2+gXyx/mRHzpI="; + hash = "sha256-TmHqKf4/zzw3kImyYvnXsYJB7sL6RRs3vGCl8+Y+4BQ="; }; postPatch = '' From 48ac68a12394e48d1372f8a126a60ea989f78cc9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 May 2025 00:46:46 +0000 Subject: [PATCH 44/90] cargo-careful: 0.4.3 -> 0.4.5 --- pkgs/by-name/ca/cargo-careful/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-careful/package.nix b/pkgs/by-name/ca/cargo-careful/package.nix index 849ec6df3eb3..8d168b4f9961 100644 --- a/pkgs/by-name/ca/cargo-careful/package.nix +++ b/pkgs/by-name/ca/cargo-careful/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "cargo-careful"; - version = "0.4.3"; + version = "0.4.5"; src = fetchFromGitHub { owner = "RalfJung"; repo = "cargo-careful"; rev = "v${version}"; - hash = "sha256-pYfyqsS+bGwSP6YZAtI+8iMXdID/hrCiX+cuYoYiZmc="; + hash = "sha256-dalsBILFZzVHBIhGGIOUMSCWuM7xE46w91MbzCYa1Io="; }; useFetchCargoVendor = true; - cargoHash = "sha256-hb3x2LKtDNAhMbRCB3kAwHloFTojGzQdXsMjxeJYB6k="; + cargoHash = "sha256-Es5BT0jfyJXuw7TTtGRhI4PeplZgTYm6JhSxQiZ+6NE="; meta = with lib; { description = "Tool to execute Rust code carefully, with extra checking along the way"; From 7406f719e6216ac8614fd5028da9554ec4d9d4b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 May 2025 01:07:12 +0000 Subject: [PATCH 45/90] myks: 4.8.1 -> 4.8.2 --- pkgs/by-name/my/myks/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 16bc3620f3e0..c230464133e9 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "myks"; - version = "4.8.1"; + version = "4.8.2"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; tag = "v${version}"; - hash = "sha256-bjry2szn4bOGsIeJl221T+6aV+MW9yXQcLBS3sJcswQ="; + hash = "sha256-HG3TuK4mh44D+qVtcfM09dbuf+M2ZuREASXxG0me3B4="; }; - vendorHash = "sha256-kUOjbBosj2u25n/fGoC0DpAYkWIgoxIfkXJlNpRALfw="; + vendorHash = "sha256-lxqAd7N5yrW453s6cEGAtCcxLyJMsWK8LtT31kTODoc="; subPackages = "."; From c2429f4a99cbfcd2352ca33a21abb61a65891f25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 May 2025 02:30:45 +0000 Subject: [PATCH 46/90] python3Packages.internetarchive: 5.3.0 -> 5.4.0 --- pkgs/development/python-modules/internetarchive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index 51b1a8171551..b13e862d8b5f 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "internetarchive"; - version = "5.3.0"; + version = "5.4.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jjjake"; repo = "internetarchive"; tag = "v${version}"; - hash = "sha256-1DJ4ZPL1Px1BKP9RHY/evoIwLzxG0aQNq9gteBi4RZs="; + hash = "sha256-2IL4VUt958atKDqCmj6rZ9I74tBRsA42EF1F1YT433E="; }; build-system = [ setuptools ]; From c2640da88cb7342c9491c733cd9476372e8bf91d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 May 2025 02:30:58 +0000 Subject: [PATCH 47/90] i-pi: 3.1.2 -> 3.1.4 --- pkgs/development/python-modules/i-pi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/i-pi/default.nix b/pkgs/development/python-modules/i-pi/default.nix index f76239735798..325dfebbbd41 100644 --- a/pkgs/development/python-modules/i-pi/default.nix +++ b/pkgs/development/python-modules/i-pi/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "i-pi"; - version = "3.1.2"; + version = "3.1.4"; pyproject = true; src = fetchFromGitHub { owner = "i-pi"; repo = "i-pi"; tag = "v${version}"; - hash = "sha256-OZuPJgcLyxZ+z3U3vraTq4MwgyMkBOHVJxB/y3qd7qw="; + hash = "sha256-qM1DQNHTliYGWtVeYo0KEAg88cdt9GPB9w0pep0erj8="; }; build-system = [ From df3ebb633cc825033080791d7ad3004828da80da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 May 2025 03:29:15 +0000 Subject: [PATCH 48/90] yq-go: 4.45.1 -> 4.45.3 --- pkgs/by-name/yq/yq-go/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/yq/yq-go/package.nix b/pkgs/by-name/yq/yq-go/package.nix index ba6e639b5732..13d0f6eb1e8e 100644 --- a/pkgs/by-name/yq/yq-go/package.nix +++ b/pkgs/by-name/yq/yq-go/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.45.1"; + version = "4.45.3"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - hash = "sha256-AsTDbeRMb6QJE89Z0NGooyTY3xZpWFoWkT7dofsu0DI="; + hash = "sha256-xa0kIdb/Y+1zqGulmQ3qR62E9q4s5CCooYvsUDsZN9E="; }; - vendorHash = "sha256-d4dwhZYzEuyh1zJQ2xU0WkygHjoVLoCBrDKuAHUzu1w="; + vendorHash = "sha256-cA5Y0/2lvYfVXr4zgtp/U8aBUkHnh9xb9jDHVk/2OME="; nativeBuildInputs = [ installShellFiles ]; From 37c00e14ee25c31e13e69324228556b4cf67f127 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 May 2025 03:51:42 +0000 Subject: [PATCH 49/90] python3Packages.oci: 2.142.0 -> 2.151.0 --- pkgs/development/python-modules/oci/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index ef50eaf7876e..647729d3bcdd 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "oci"; - version = "2.142.0"; + version = "2.151.0"; pyproject = true; src = fetchFromGitHub { owner = "oracle"; repo = "oci-python-sdk"; tag = "v${version}"; - hash = "sha256-QZJjUgu2FSL1+fDuSD74mV1t7Y4PyMRJ1TsXrgOmvDU="; + hash = "sha256-8nAe7r62ItTyjFi32r3b3ikAg6/vw9huO7204sUVmuI="; }; pythonRelaxDeps = [ From f7e7748db18858b93acc243d46c3dc03b49f8555 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 May 2025 04:40:59 +0000 Subject: [PATCH 50/90] netbird: 0.43.2 -> 0.43.3 --- pkgs/by-name/ne/netbird/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix index c2ffdade1216..9ec81aa17401 100644 --- a/pkgs/by-name/ne/netbird/package.nix +++ b/pkgs/by-name/ne/netbird/package.nix @@ -31,13 +31,13 @@ let in buildGoModule (finalAttrs: { pname = "netbird"; - version = "0.43.2"; + version = "0.43.3"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; tag = "v${finalAttrs.version}"; - hash = "sha256-VZWd7KXMfh/OOnvprF5S69ztDK3N5w3lmfO2OGUC+FQ="; + hash = "sha256-+WEAUM+BrckRCUycCaYr7tveZBZ2kStnMPxyDVixAsA="; }; vendorHash = "sha256-/STnSegRtpdMhh9RaCqwc6dSXvt7UO5GVz7/M9JzamM="; From 7930c1ec502b761a54ec7281c5080fc9e52215e9 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 10 May 2025 08:55:23 +0400 Subject: [PATCH 51/90] =?UTF-8?q?python312Packages.pynmeagps:=201.0.49=20?= =?UTF-8?q?=E2=86=92=201.0.50?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/pynmeagps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynmeagps/default.nix b/pkgs/development/python-modules/pynmeagps/default.nix index feb2c7c95879..4a2456811c4c 100644 --- a/pkgs/development/python-modules/pynmeagps/default.nix +++ b/pkgs/development/python-modules/pynmeagps/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pynmeagps"; - version = "1.0.49"; + version = "1.0.50"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "semuconsulting"; repo = "pynmeagps"; tag = "v${version}"; - hash = "sha256-ePqXJ29x+IF/K+Dz7BiLOdiaMx43yVriY8RFBDVlCB0="; + hash = "sha256-ApZoltkqbbBVqbVouLNJj80FlQhAJIf2qCiGLgwrZbk="; }; build-system = [ setuptools ]; From a2e79da76c39c94b0cbadedd20ecd44b9ae90243 Mon Sep 17 00:00:00 2001 From: misilelab Date: Sat, 10 May 2025 14:41:30 +0900 Subject: [PATCH 52/90] foundry: 1.0.0 -> 1.1.0 https://github.com/foundry-rs/foundry/releases/tag/v1.1.0 Signed-off-by: misilelab --- pkgs/by-name/fo/foundry/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fo/foundry/package.nix b/pkgs/by-name/fo/foundry/package.nix index fd6d298e711a..8b8d331882fd 100644 --- a/pkgs/by-name/fo/foundry/package.nix +++ b/pkgs/by-name/fo/foundry/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "foundry"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "foundry-rs"; repo = "foundry"; tag = "v${version}"; - hash = "sha256-YTsneUj5OPw7EyKZMFLJJeAtZoD0je1DdmfMjVju4L8="; + hash = "sha256-bFr1mzp1evaCJsVj5H20ShoaGMJ1TPB/91Yd37ZGNsI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-vVRFS7o0zV+ek9ho+URks6peOryMpFCE1sDzN9g7uH0="; + cargoHash = "sha256-v+7sykIVdrzBOkNVnpgUnCUG7SUf2UToq9P539UAOH4="; nativeBuildInputs = [ pkg-config From 6b89a7863ae7cf6b277466fb48d6f95b8b7e6f91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 May 2025 05:59:56 +0000 Subject: [PATCH 53/90] dwlb: 0-unstable-2024-05-16 -> 0-unstable-2025-05-05 --- pkgs/by-name/dw/dwlb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dw/dwlb/package.nix b/pkgs/by-name/dw/dwlb/package.nix index 1c3354d54f02..c864de7dafdb 100644 --- a/pkgs/by-name/dw/dwlb/package.nix +++ b/pkgs/by-name/dw/dwlb/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation { pname = "dwlb"; - version = "0-unstable-2024-05-16"; + version = "0-unstable-2025-05-05"; src = fetchFromGitHub { owner = "kolunmi"; repo = "dwlb"; - rev = "0daa1c1fdd82c4d790e477bf171e23ca2fdfa0cb"; - hash = "sha256-Bu20IqRwBP1WRBgbcEQU4Q2BZ2FBnVaySOTsCn0iSSE="; + rev = "efaef82d5ee390e478fba57b6300953f838803cd"; + hash = "sha256-rkvJZKf5mB8Xxvab+i1jKUeNtuaA8wTd/pkL9lMhGi8="; }; nativeBuildInputs = [ From dab4055530793b8753e3990a109138839c5c4b09 Mon Sep 17 00:00:00 2001 From: Zexin Yuan Date: Thu, 17 Apr 2025 16:09:57 +0800 Subject: [PATCH 54/90] python3Packages.swcgeom: init at 0.19.3 --- .../python-modules/swcgeom/default.nix | 90 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 92 insertions(+) create mode 100644 pkgs/development/python-modules/swcgeom/default.nix diff --git a/pkgs/development/python-modules/swcgeom/default.nix b/pkgs/development/python-modules/swcgeom/default.nix new file mode 100644 index 000000000000..7de34846241a --- /dev/null +++ b/pkgs/development/python-modules/swcgeom/default.nix @@ -0,0 +1,90 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + cython, + numpy, + setuptools, + wheel, + imagecodecs, + matplotlib, + pandas, + pynrrd, + scipy, + sdflit, + seaborn, + tifffile, + tqdm, + typing-extensions, + beautifulsoup4, + certifi, + chardet, + lmdb, + requests, + urllib3, + pytest, +}: + +let + version = "0.19.3"; +in +buildPythonPackage { + pname = "swcgeom"; + inherit version; + pyproject = true; + + src = fetchFromGitHub { + owner = "yzx9"; + repo = "swcgeom"; + tag = "v${version}"; + hash = "sha256-mpp8Dw0XcU59fYt7vjswAnXCmrRP3mhbgTDG+J4UwzI="; + }; + + build-system = [ + cython + numpy + setuptools + wheel + ]; + + dependencies = [ + imagecodecs + matplotlib + numpy + pandas + pynrrd + scipy + sdflit + seaborn + tifffile + tqdm + typing-extensions + ]; + + optional-dependencies = { + all = [ + beautifulsoup4 + certifi + chardet + lmdb + requests + urllib3 + ]; + }; + + nativeCheckInputs = [ + pytest + ]; + + pythonImportsCheck = [ + "swcgeom" + ]; + + meta = { + description = "Neuron geometry library for swc format"; + homepage = "https://github.com/yzx9/swcgeom"; + changelog = "https://github.com/yzx9/swcgeom/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ yzx9 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f2d7e44aa04f..873534a5a8bc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16765,6 +16765,8 @@ self: super: with self; { swagger-ui-bundle = callPackage ../development/python-modules/swagger-ui-bundle { }; + swcgeom = callPackage ../development/python-modules/swcgeom { }; + swh-auth = callPackage ../development/python-modules/swh-auth { }; swh-core = callPackage ../development/python-modules/swh-core { }; From df45ccd22b79d7537e2edb47cfe25524286d995d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 10 May 2025 07:47:46 +0200 Subject: [PATCH 55/90] vscode-extensions.github.copilot: 1.309.0 -> 1.317.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 487c0c39e68e..e881354c7341 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2110,8 +2110,8 @@ let publisher = "github"; name = "copilot"; # Verify which version is available with nix run nixpkgs#vsce -- show github.copilot --json - version = "1.309.0"; - hash = "sha256-i1PcbbOBgULd+inwypezE/ZsePrJaqM2z6qrDcNBLVA="; + version = "1.317.0"; + hash = "sha256-w8HH1ibkOrpuKi3Yhzr+DjVIY7HWZ2L4rYzNYrHkfbc="; }; meta = { From cbf7bcade74a9357f0639ac19db30ccabea66ddb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 May 2025 07:13:21 +0000 Subject: [PATCH 56/90] halo: 2.20.19 -> 2.20.20 --- pkgs/by-name/ha/halo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix index 84680ec9677b..4576bf66f5fd 100644 --- a/pkgs/by-name/ha/halo/package.nix +++ b/pkgs/by-name/ha/halo/package.nix @@ -8,10 +8,10 @@ }: stdenv.mkDerivation rec { pname = "halo"; - version = "2.20.19"; + version = "2.20.20"; src = fetchurl { url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar"; - hash = "sha256-4xXg1pW6vXebrmmyhzQKmJReR8gfRrflrfuB3ijk4tc="; + hash = "sha256-8q87oGE7uEbs78rkFcF3FD+ms+9dlk+12G2CL/tEJKY="; }; nativeBuildInputs = [ From 09d70d93ce5ce155bbeaaf616f46f7c61218c2ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 May 2025 00:57:07 +0000 Subject: [PATCH 57/90] deconz: 2.29.5 -> 2.30.2 --- pkgs/servers/deconz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/deconz/default.nix b/pkgs/servers/deconz/default.nix index 62dd20a976d7..f2ad6d918cb9 100644 --- a/pkgs/servers/deconz/default.nix +++ b/pkgs/servers/deconz/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "deconz"; - version = "2.29.5"; + version = "2.30.2"; src = fetchurl { url = "https://deconz.dresden-elektronik.de/ubuntu/beta/deconz-${version}-qt5.deb"; - sha256 = "sha256-vUMnxduQfZv6YHA2hRnhbKf9sBvVCCE2n4ZnutmaRpw="; + sha256 = "sha256-exkelou1xgFEtW3vUqMZFc4AqXruzMRD9n23WmUFr3k="; }; nativeBuildInputs = [ From 30995f2e7e1c2d618e74a4a64b98a472a6b6ae41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 9 May 2025 17:11:19 +0200 Subject: [PATCH 58/90] qmmp: 2.1.8 -> 2.2.5 Fixes this build error: /nix/store/...-qtbase-6.9.0/include/QtCore/qiodevice.h:90:44: error: 'byte_' is not a member of 'std'; did you mean 'byte'? 90 | QByteArrayView readLineInto(QSpan buffer); | ^~~~ --- pkgs/applications/audio/qmmp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 407d44c785da..609ed4837a8d 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -57,11 +57,11 @@ stdenv.mkDerivation rec { pname = "qmmp"; - version = "2.1.8"; + version = "2.2.5"; src = fetchurl { - url = "https://qmmp.ylsoftware.com/files/qmmp/2.1/${pname}-${version}.tar.bz2"; - hash = "sha256-hGphQ8epqym47C9doiSOQd3yc28XwV2UsNc7ivhaae4="; + url = "https://qmmp.ylsoftware.com/files/qmmp/2.2/${pname}-${version}.tar.bz2"; + hash = "sha256-WCEfMnrDhau8fXXmpdjdZLzbXMDxEZMp8pJ9FjEJfhg="; }; nativeBuildInputs = [ From c83285ade328a12ff2477d9345714e0dfb16d28b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 9 May 2025 17:16:58 +0200 Subject: [PATCH 59/90] qmmp: move to pkgs/by-name Do the necessary adaptation to be compatible with pkgs/by-name, by taking top-level qt6 as input instead of the individual qt modules (qtbase, ...), which were previously explicitly taken from qt6Packages. No rebuild. --- .../default.nix => by-name/qm/qmmp/package.nix} | 13 +++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 5 insertions(+), 10 deletions(-) rename pkgs/{applications/audio/qmmp/default.nix => by-name/qm/qmmp/package.nix} (94%) diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/by-name/qm/qmmp/package.nix similarity index 94% rename from pkgs/applications/audio/qmmp/default.nix rename to pkgs/by-name/qm/qmmp/package.nix index 609ed4837a8d..afe7406a6a97 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/by-name/qm/qmmp/package.nix @@ -4,10 +4,7 @@ fetchurl, cmake, pkg-config, - qtbase, - qttools, - qtmultimedia, - wrapQtAppsHook, + qt6, # transports curl, libmms, @@ -67,14 +64,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ # basic requirements - qtbase - qttools - qtmultimedia + qt6.qtbase + qt6.qttools + qt6.qtmultimedia # transports curl libmms diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43ecd33124f6..87e8e3032f93 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13817,8 +13817,6 @@ with pkgs; qmidinet = libsForQt5.callPackage ../applications/audio/qmidinet { }; - qmmp = qt6Packages.callPackage ../applications/audio/qmmp { }; - qnotero = libsForQt5.callPackage ../applications/office/qnotero { }; qpwgraph = qt6Packages.callPackage ../applications/audio/qpwgraph { }; From 90c0380c8bb4de642ba29995f26483060c0a53d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 May 2025 07:26:13 +0000 Subject: [PATCH 60/90] kubetui: 1.7.0 -> 1.7.1 --- pkgs/by-name/ku/kubetui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubetui/package.nix b/pkgs/by-name/ku/kubetui/package.nix index d271b1c88329..a88c47c290a4 100644 --- a/pkgs/by-name/ku/kubetui/package.nix +++ b/pkgs/by-name/ku/kubetui/package.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "kubetui"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "sarub0b0"; repo = "kubetui"; tag = "v${version}"; - hash = "sha256-p7NPHOmeDzZ8OlVnpOOoTksWbWcnKlzsXu/mYmMU4l4="; + hash = "sha256-CtKckAmvXdH+CU+nV1hNGhemOCj5HRkAEQDSMD32CFE="; }; checkFlags = [ @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { ]; useFetchCargoVendor = true; - cargoHash = "sha256-fMrlZMe2uD+ImM6zPXzo/+/Eto2MeIyscYfU8msLJFw="; + cargoHash = "sha256-+O22eo2vj4WLbSQoUfGOOfp2a43j2RrVXvB7CmYRA1o="; meta = { homepage = "https://github.com/sarub0b0/kubetui"; From 05762e33772bdd8fd8e8144a69a7cf361ba4a81f Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 10 May 2025 11:26:40 +0300 Subject: [PATCH 61/90] kdePackages: Frameworks 6.13 -> 6.14 --- pkgs/kde/frameworks/kguiaddons/default.nix | 6 +- pkgs/kde/frameworks/kwallet/default.nix | 7 + pkgs/kde/generated/sources/frameworks.json | 432 ++++++++++----------- 3 files changed, 228 insertions(+), 217 deletions(-) diff --git a/pkgs/kde/frameworks/kguiaddons/default.nix b/pkgs/kde/frameworks/kguiaddons/default.nix index e4cf58bbb36f..7e664e9f70ad 100644 --- a/pkgs/kde/frameworks/kguiaddons/default.nix +++ b/pkgs/kde/frameworks/kguiaddons/default.nix @@ -2,11 +2,15 @@ mkKdeDerivation, qtwayland, pkg-config, + wayland-protocols, }: mkKdeDerivation { pname = "kguiaddons"; extraNativeBuildInputs = [ pkg-config ]; - extraBuildInputs = [ qtwayland ]; + extraBuildInputs = [ + qtwayland + wayland-protocols + ]; meta.mainProgram = "kde-geo-uri-handler"; } diff --git a/pkgs/kde/frameworks/kwallet/default.nix b/pkgs/kde/frameworks/kwallet/default.nix index bc478ed582cc..3ba43cd40e3e 100644 --- a/pkgs/kde/frameworks/kwallet/default.nix +++ b/pkgs/kde/frameworks/kwallet/default.nix @@ -1,13 +1,20 @@ { mkKdeDerivation, + pkg-config, libgcrypt, + libsecret, kdoctools, }: mkKdeDerivation { pname = "kwallet"; + extraNativeBuildInputs = [ + pkg-config + ]; + extraBuildInputs = [ libgcrypt + libsecret kdoctools ]; } diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json index 7cc16f3efb7a..4201331259ff 100644 --- a/pkgs/kde/generated/sources/frameworks.json +++ b/pkgs/kde/generated/sources/frameworks.json @@ -1,362 +1,362 @@ { "attica": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/attica-6.13.0.tar.xz", - "hash": "sha256-rMy3/2Lh5CH6pf/TgbQXd9DHv7omj64e2AK1GmvZioc=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/attica-6.14.0.tar.xz", + "hash": "sha256-fDVWr+sK4OkywuTTCd9JBfPi9Brz47OAUbSdnyeTV8E=" }, "baloo": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/baloo-6.13.0.tar.xz", - "hash": "sha256-W0V02aSggL3JdekxvUEac4agwX/w1cV1HdJskgEBM/g=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/baloo-6.14.0.tar.xz", + "hash": "sha256-q2D5Q2B/Z5KbYZwClJjwf6h2euxqf7Auz3OSztJXNLQ=" }, "bluez-qt": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/bluez-qt-6.13.0.tar.xz", - "hash": "sha256-GpmVSgqtcNMOe2DoC2czJTR0PsRVbr2yem9AtvEUkUI=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/bluez-qt-6.14.0.tar.xz", + "hash": "sha256-6oRfkw7MfE8lnEeK5mgMeTldyyWY7j9bRbztbfJ3+dU=" }, "breeze-icons": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/breeze-icons-6.13.0.tar.xz", - "hash": "sha256-dtoFRILAuX4K5ouUqsqRmMUAKI3teLNL2ws8uIxHO10=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/breeze-icons-6.14.0.tar.xz", + "hash": "sha256-zfnLZ86dbrmWnsMkzpJVbK8alPEncMVs8MWI3CxoHS8=" }, "extra-cmake-modules": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/extra-cmake-modules-6.13.0.tar.xz", - "hash": "sha256-cAYBfADIF/9MBWmVFG0nF5HRSHo5jTnqbKwc1ZqL9AI=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/extra-cmake-modules-6.14.0.tar.xz", + "hash": "sha256-0Cy7syabOWgIhKv28Uumj0SFcMVUFz9SSdo7h2F4TBM=" }, "frameworkintegration": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/frameworkintegration-6.13.0.tar.xz", - "hash": "sha256-GCuRHJoI3piQwkJ+ihz8ICtK4FrqN8bZOaRJv6mH8x8=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/frameworkintegration-6.14.0.tar.xz", + "hash": "sha256-6iY3It5LN8h0KnCrBX2gYuW3HQ4I6YZFaj3ETiDwA7c=" }, "kapidox": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kapidox-6.13.0.tar.xz", - "hash": "sha256-820HphMbOUf0yMX4XapiDpI2sF/R5kpe7Hrxo5LLNjE=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kapidox-6.14.0.tar.xz", + "hash": "sha256-zXuXa5jR5sbMPaHSDFOVM+DRrnYl5j4UvHx4EJapFUY=" }, "karchive": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/karchive-6.13.0.tar.xz", - "hash": "sha256-PJtdzzq9/idh4hU9cNnWZ/H/D9L2yArdunVJ2pVPzJA=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/karchive-6.14.0.tar.xz", + "hash": "sha256-LLL1TLn4Ey2vaIpdSs1/S+xAIDsBVR/wbm2h6fh/Dvk=" }, "kauth": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kauth-6.13.0.tar.xz", - "hash": "sha256-ozvweCjYjPSZyL/nF/Avfiidz09YuPOq6eL5VhWo2NY=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kauth-6.14.0.tar.xz", + "hash": "sha256-9aFuSJ8mtXQdPxG/ayA/2ZqE7KrnmOtrDqoNcciPZkU=" }, "kbookmarks": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kbookmarks-6.13.0.tar.xz", - "hash": "sha256-ax1T1I46jS2vgzXxBcM4n5lwi+Rv98wC3uXVkOZtstI=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kbookmarks-6.14.0.tar.xz", + "hash": "sha256-o/CmH8/MplCfHX0hKJ4yd2YW58rd7AfLnhyoHi946kM=" }, "kcalendarcore": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kcalendarcore-6.13.0.tar.xz", - "hash": "sha256-4VBKhR85+/m+rAXWIspG671unysRBuccXUu/fKf6H0E=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kcalendarcore-6.14.0.tar.xz", + "hash": "sha256-cCv8Lt/O1NCQM2VldDT9jC3AuPZtDOluTqC2lQ74eYs=" }, "kcmutils": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kcmutils-6.13.0.tar.xz", - "hash": "sha256-EfAyO4250hUXlirw/7vvW6P5PA8RmIHe0IvpQA3BXI8=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kcmutils-6.14.0.tar.xz", + "hash": "sha256-IzbwXuRmaN4r5wwwFmDJ06iBxABG75DRIF5AgmC0YAU=" }, "kcodecs": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kcodecs-6.13.0.tar.xz", - "hash": "sha256-3d3gXZcNAmrmorMeNVlTIQf03mDybX2HpFczF24SIII=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kcodecs-6.14.0.tar.xz", + "hash": "sha256-AI9ZEhYtOUSYAi0OlVyGDHfDOGfo+kSOmUSPOjZNaRQ=" }, "kcolorscheme": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kcolorscheme-6.13.0.tar.xz", - "hash": "sha256-irilZ724uD9kgkrT1EkHfsuS9zAkMU9V7qt3d9kSnt8=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kcolorscheme-6.14.0.tar.xz", + "hash": "sha256-YBswTdXML7Bl2OZYvbC4fh43AhAAz2pvWy7opb+69ck=" }, "kcompletion": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kcompletion-6.13.0.tar.xz", - "hash": "sha256-VVzqytv9kaBZ3t49nwapOThY/eoStVhBNa1BOaKnkQo=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kcompletion-6.14.0.tar.xz", + "hash": "sha256-065qmjZfE9Ha5AQLtMl86Gp0hlym7SH5CBEVmKITgTY=" }, "kconfig": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kconfig-6.13.0.tar.xz", - "hash": "sha256-LsZsmWKI30cvzDq6UFQOJm+2IY1g0456SkRdSxk/lEU=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kconfig-6.14.0.tar.xz", + "hash": "sha256-obJ+dit4+8NBJPNf1BJXEfQDauUyx50889xoMonB52U=" }, "kconfigwidgets": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kconfigwidgets-6.13.0.tar.xz", - "hash": "sha256-xd9V1zsRb+VmhjzDuQvU7f1cSYnxIez9jgwffI5ANlo=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kconfigwidgets-6.14.0.tar.xz", + "hash": "sha256-Av7maFktUrs5KU+ZmvZ3l9eXfj8cYbucd8CGcwWUMZ8=" }, "kcontacts": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kcontacts-6.13.0.tar.xz", - "hash": "sha256-w/OJ+eQfKq6+XGssb7wzkn9kQjyyTMJA9h6T28BXUG8=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kcontacts-6.14.0.tar.xz", + "hash": "sha256-ZP1vJpLcW+qbxyD1K/2yiAdx2C2yfhycD2GshG5QNyk=" }, "kcoreaddons": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kcoreaddons-6.13.0.tar.xz", - "hash": "sha256-oRC8MwPFQfusPi06qTwuslQTBV3iRjSmkDQhD23929s=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kcoreaddons-6.14.0.tar.xz", + "hash": "sha256-lVXRcpX0/s4YtG49KJBVuvWLNS4ILk2m5uNS2NXAQu4=" }, "kcrash": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kcrash-6.13.0.tar.xz", - "hash": "sha256-Ji4prbpEXT0AslBD5TwCPzKix93hFxHCpIPDU21XuV8=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kcrash-6.14.0.tar.xz", + "hash": "sha256-adc2vnO75Kk2+JlsNZGlPBaBbUOW0kLS5j3OB5omjDQ=" }, "kdav": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kdav-6.13.0.tar.xz", - "hash": "sha256-12fo9RWNf0wfWI8XKGF3FFiA2Az7LiFfVUpsgg+GsNk=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kdav-6.14.0.tar.xz", + "hash": "sha256-qSuV+wYSx5xYdOeoX0g2nDoA0sHS2Ux3ZWIpyUXnfCo=" }, "kdbusaddons": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kdbusaddons-6.13.0.tar.xz", - "hash": "sha256-my8WBFo4sNsU0ZRqPfVSrtRe2smB5b/2n8l1Kryxf54=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kdbusaddons-6.14.0.tar.xz", + "hash": "sha256-9nPJ8pXfWZiUje+UyvktSH1jiGRSgC/7l60VExVifuQ=" }, "kdeclarative": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kdeclarative-6.13.0.tar.xz", - "hash": "sha256-6CjjYz2PBv69a7HK9dyYMhjofJ+1qxJZQptnb5awoyg=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kdeclarative-6.14.0.tar.xz", + "hash": "sha256-7QqmJlP+Wgm8RPWE+qpjPLOG96EGz5tckwEirobAodA=" }, "kded": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kded-6.13.0.tar.xz", - "hash": "sha256-cHWkLQcMQksIODzrAedms0lXvjfP201xNs29+ECTH7g=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kded-6.14.0.tar.xz", + "hash": "sha256-WfGuyUvQF266i//TWmrVklttQHAuJu4Wl6RrOkYX0co=" }, "kdesu": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kdesu-6.13.0.tar.xz", - "hash": "sha256-a+keshkSuyUh9OTxkmdjnDvtM6td0J958nni+Uw4CmI=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kdesu-6.14.0.tar.xz", + "hash": "sha256-EDoGMRwDVEX9WISEXFc2nwcikjn5u+vpHMlbfOjFyiM=" }, "kdnssd": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kdnssd-6.13.0.tar.xz", - "hash": "sha256-49Jd+qOIbf9IUeW4j2Uva8bo6HGHCL2AukmHUUGQfoI=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kdnssd-6.14.0.tar.xz", + "hash": "sha256-zpA5UrkIVmuZ1QpKVJgl6k75XXVEaGzczM9pO4EQYZk=" }, "kdoctools": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kdoctools-6.13.0.tar.xz", - "hash": "sha256-tcXAJdJpyDlHfz8mTAl68HTnPysHrRqGgzZ/OV0qyq0=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kdoctools-6.14.0.tar.xz", + "hash": "sha256-rLnHYejhDDDywyBh9kCWllRZoFEyUO30Qy9AgxoPU24=" }, "kfilemetadata": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kfilemetadata-6.13.0.tar.xz", - "hash": "sha256-CQ/NBVd815QOcHL8+IVfGn8Hb/Ca4zl7v6QGgd6kvp4=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kfilemetadata-6.14.0.tar.xz", + "hash": "sha256-klqdsnF2UZCZ0kYlBwv368FgD65+fQauTu4yeaZ9MeU=" }, "kglobalaccel": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kglobalaccel-6.13.0.tar.xz", - "hash": "sha256-mVTxaozyV/RWnP27ZKhCz1N/4vr2tPqP4Y9idE7+lrA=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kglobalaccel-6.14.0.tar.xz", + "hash": "sha256-56rKFrtMW1hlrz7UtI8jR8UWMGXRfCskvpd1L/Xoxx0=" }, "kguiaddons": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kguiaddons-6.13.0.tar.xz", - "hash": "sha256-koCg8E8puOT/q+PJQmIeLGCSvcADejq54LmeXqVohL8=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kguiaddons-6.14.0.tar.xz", + "hash": "sha256-PzzH43SL101Hako2FmVHhufYYfezkehJmuvHxBDyHsU=" }, "kholidays": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kholidays-6.13.0.tar.xz", - "hash": "sha256-N9Kur7LHaV923cCY0HZG639loDrufItf7Qq3xO8mR3U=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kholidays-6.14.0.tar.xz", + "hash": "sha256-bdZvy6r8jUUEWson4zTh9g32r9mgcLHzKZa6BJcncXc=" }, "ki18n": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/ki18n-6.13.0.tar.xz", - "hash": "sha256-AIwKMiNdwqfTqi+pqYpUDxtLr2q179FIOaEf2m50ahQ=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/ki18n-6.14.0.tar.xz", + "hash": "sha256-KlE1QSyvCgfrpO62CGesaSnfHIPBRa51emoSMPhC5mk=" }, "kiconthemes": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kiconthemes-6.13.0.tar.xz", - "hash": "sha256-oyeMXSnC/bDvXdcqDV+bWnXAcmYwJuHk/bsn9Rv6WqE=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kiconthemes-6.14.0.tar.xz", + "hash": "sha256-qYzSMb/KQgUZ1VsLiOTgibTifsebSoVCuB3opf+K9tU=" }, "kidletime": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kidletime-6.13.0.tar.xz", - "hash": "sha256-7hfT983VBzkODpupaJa33PqgCOOFqdtCMge8PuI25tw=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kidletime-6.14.0.tar.xz", + "hash": "sha256-FndbK9w+/VTGWpa85vJ6AB0RmQVTHYS7I+IyFaGW7Lg=" }, "kimageformats": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kimageformats-6.13.0.tar.xz", - "hash": "sha256-jKzpLcSc4krYZbMdG/suqy189VBUJmD50qFtvptH804=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kimageformats-6.14.0.tar.xz", + "hash": "sha256-Og+BviXpoOq33BNzvFZICryzBByhpajH8NbVLSIdVEk=" }, "kio": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kio-6.13.0.tar.xz", - "hash": "sha256-QxVS0LdA81fE233i4o3PDsKOK/sEGgQtpXCK4m7CogM=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kio-6.14.0.tar.xz", + "hash": "sha256-mwN0b9AIUEqW9Wnzetj/kCzHFJXn4SPao8beef8qzEU=" }, "kirigami": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kirigami-6.13.0.tar.xz", - "hash": "sha256-3Vqhtbj7xOtzEieFGvfKnKodyqwNyZQh29PQ1Y2Ygyk=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kirigami-6.14.0.tar.xz", + "hash": "sha256-Fixim6UOfa5EOe9QJyoMFQy6s3FBWn0esWDb42OPYZo=" }, "kitemmodels": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kitemmodels-6.13.0.tar.xz", - "hash": "sha256-QWxHkumRjE+Qnh2tj751UftWFwPALU4AAbNy3x+rWOY=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kitemmodels-6.14.0.tar.xz", + "hash": "sha256-HWlBgEZOH9leJCXYS7hGFX+tPCpQCXJ+zbZ2bZfbIug=" }, "kitemviews": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kitemviews-6.13.0.tar.xz", - "hash": "sha256-4N6Mn6K6onvear04R7bV9MtUrs6rNDbGT4mlD+HZaV0=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kitemviews-6.14.0.tar.xz", + "hash": "sha256-mXFnQC26p4ha4qqkz4tfQJ9X1QvOBqO1bFd+k6l1uko=" }, "kjobwidgets": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kjobwidgets-6.13.0.tar.xz", - "hash": "sha256-aPg4gSxDBCEsDSVhHEJRwnqHYIhbPbIt+pCTVcVzuJU=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kjobwidgets-6.14.0.tar.xz", + "hash": "sha256-jEcEKvrldEeUW0PMkdiX+jUyhiN6Y+NSlL5OtKRmKr0=" }, "knewstuff": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/knewstuff-6.13.0.tar.xz", - "hash": "sha256-M4hzzsoFk/A6dgcy5PjQ/RuwWfIbfe3N4T9eWUIm15g=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/knewstuff-6.14.0.tar.xz", + "hash": "sha256-HkS3HvxdxMsFzHrdNE2aVfyMmY3ibnSGfTAK+9FvjQQ=" }, "knotifications": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/knotifications-6.13.0.tar.xz", - "hash": "sha256-0rEvHUroD3ALyHQRLs7pmx5EQ4xJuyqKd860xwVp+d0=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/knotifications-6.14.0.tar.xz", + "hash": "sha256-p26V3nQSnhL1ALAfjOJSm8avk7df8szpnIJxKVI9dRc=" }, "knotifyconfig": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/knotifyconfig-6.13.0.tar.xz", - "hash": "sha256-q5s56/wd6C+Kq8OkQa/tcwICoz1ygoMI6tyBIy74ObQ=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/knotifyconfig-6.14.0.tar.xz", + "hash": "sha256-Bn66XJllqwXN0+ilfWr6Jeip53kF1NAaMnU2wR1Myos=" }, "kpackage": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kpackage-6.13.0.tar.xz", - "hash": "sha256-piJpSqcj15t7SYjLK8UfhdIPyq/uAg90HuUgU9yFZIo=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kpackage-6.14.0.tar.xz", + "hash": "sha256-+y4mD3ouK0z9pFWYgUhYmad89fvDuK4F0GREvsgu0as=" }, "kparts": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kparts-6.13.0.tar.xz", - "hash": "sha256-yNM2+rTTewlryfD/8tCm7yU5QFm8h/ypOwDqaynjPfQ=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kparts-6.14.0.tar.xz", + "hash": "sha256-lhBhAsTeuJMwfrNVgKikWqaEHtwDi5oP04qhnW4Fa/o=" }, "kpeople": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kpeople-6.13.0.tar.xz", - "hash": "sha256-OuwcoRHvIceScXCgDSDpcbWxlbGah98Yo65cuWh8+AQ=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kpeople-6.14.0.tar.xz", + "hash": "sha256-ydIRDa8uTVnVi0r2PFT9UXuw9GWRqRwgeJ/8cV7rYs4=" }, "kplotting": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kplotting-6.13.0.tar.xz", - "hash": "sha256-kYtW+dCsZ318Tr4/EknatcfUav2KKPlAdRZV+8STWRY=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kplotting-6.14.0.tar.xz", + "hash": "sha256-5rYxhPlzvw0SQCd539GHH3aFt5VONomORkCshrnJd6w=" }, "kpty": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kpty-6.13.0.tar.xz", - "hash": "sha256-r6j6jFeb0spLDMzGlCf5A1+n12zv4lhjnsF9lmqkNRM=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kpty-6.14.0.tar.xz", + "hash": "sha256-l54LsZzX2duEO/XfNRFUR+tJJjegmetTw0W4L8gL6mU=" }, "kquickcharts": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kquickcharts-6.13.0.tar.xz", - "hash": "sha256-vOB+laRg9EyxpRkalv2yLa/uaB8J2+0o/nUI4zIZ6gs=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kquickcharts-6.14.0.tar.xz", + "hash": "sha256-37M8kO7cfJUOBD+yrfbIot83ReedK7zV5ZV1dEj+mLc=" }, "krunner": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/krunner-6.13.0.tar.xz", - "hash": "sha256-XeF3Wm5drztygQ+biq/e6WXRS/Zwhkrq3kR45Q8E9Ts=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/krunner-6.14.0.tar.xz", + "hash": "sha256-E4z7mM1zOSci9EmUCNB1osdwW9v0NuzAdzYMMVPbL6Y=" }, "kservice": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kservice-6.13.0.tar.xz", - "hash": "sha256-ZdlUL3KdML49zBKqLr61AjjOTTCoUHdfmwBrm58cHNU=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kservice-6.14.0.tar.xz", + "hash": "sha256-XvgPRwNNWCzgWgvs8BlSZjGR+vxWnPs+97hcJP0peoU=" }, "kstatusnotifieritem": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kstatusnotifieritem-6.13.0.tar.xz", - "hash": "sha256-7Th/3uPctbw/qVbva7mb0tTA7VbuXi8diauusMC03po=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kstatusnotifieritem-6.14.0.tar.xz", + "hash": "sha256-nYXESncErQUnQHUhBuWesm5J2ARn+bHTySvSS3c5VBc=" }, "ksvg": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/ksvg-6.13.0.tar.xz", - "hash": "sha256-m/DSp2JlV7Q8UIIbq30ZYKc/jrmB6okqZMtKESd+0ks=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/ksvg-6.14.0.tar.xz", + "hash": "sha256-FFZkn/LhOX4qZmziS7tvB0/aXLlq2kJdEivMFHRKXc4=" }, "ktexteditor": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/ktexteditor-6.13.0.tar.xz", - "hash": "sha256-fBLvBh9FvcO17MXA7skInNZSHEmSF94HonPcZf3Xx88=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/ktexteditor-6.14.0.tar.xz", + "hash": "sha256-uXDWu3YjkhV415CevvGMb3p5jqEcWx4kU/cyFpVndlE=" }, "ktexttemplate": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/ktexttemplate-6.13.0.tar.xz", - "hash": "sha256-QFDOdt44rLgQTYwLbn7LOL8o/01lSZ7JEfsxbzg/ktk=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/ktexttemplate-6.14.0.tar.xz", + "hash": "sha256-ZakIqlc+QM+YhKnUKkuNVXS68vQCoZdkzaLMzeJ8iXo=" }, "ktextwidgets": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/ktextwidgets-6.13.0.tar.xz", - "hash": "sha256-H/Kb8Cskfwn/qq/kV48Jd7UcQrZ+74T921Z33X0e3y4=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/ktextwidgets-6.14.0.tar.xz", + "hash": "sha256-TiTm2kd+CND3FVLwgSBlFvzZq0pZPPN9d+vWkIVrdrU=" }, "kunitconversion": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kunitconversion-6.13.0.tar.xz", - "hash": "sha256-II8DfoCJ+ZnguwqvhVcbOi00HNjkDBEbNerZ0mEAF+o=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kunitconversion-6.14.0.tar.xz", + "hash": "sha256-0H1g7CxcISRvOqn4ngEibghMkP6ZtisItlGTPDEc8I0=" }, "kuserfeedback": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kuserfeedback-6.13.0.tar.xz", - "hash": "sha256-SMGGSC/npvEBen5Qs6Fv18EMEPf5Y8APMsYbsHNAS5o=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kuserfeedback-6.14.0.tar.xz", + "hash": "sha256-JKzW0rhYK91q6b/KlyeKlnY+4YSmzey8Dc1k/U/COLI=" }, "kwallet": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kwallet-6.13.0.tar.xz", - "hash": "sha256-Gm/yzPZgpDO9prAKyHN5bctGvSRDeH/PX75MQzyoyzY=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kwallet-6.14.0.tar.xz", + "hash": "sha256-p0d+Tl58y0NJHFoOzK32oz6WIIjVrzLEtrSqy5IPWeM=" }, "kwidgetsaddons": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kwidgetsaddons-6.13.0.tar.xz", - "hash": "sha256-oVOIKZlzGfivAETteuhPebThjPKzLKzU/cR0i48cdAY=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kwidgetsaddons-6.14.0.tar.xz", + "hash": "sha256-YCcgvD6Gy6I4Tw9F4WyFJKGXR5aj1bfFwe2Q52jPEh8=" }, "kwindowsystem": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kwindowsystem-6.13.0.tar.xz", - "hash": "sha256-T6g0JPOal9f+eEUz0q1NSWn/h40mQ43ancAOMHRZWaw=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kwindowsystem-6.14.0.tar.xz", + "hash": "sha256-ZiX31aRsucciibyqpl7nRFCmceTb9u6+/HcmUPJM8qY=" }, "kxmlgui": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/kxmlgui-6.13.0.tar.xz", - "hash": "sha256-4QZILTuxX3r97rVULg8PPKJrm1xjdKA8oYFT1dJ1DeY=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/kxmlgui-6.14.0.tar.xz", + "hash": "sha256-X5o10WjlvoXEPlZvh79xCMGOOhlCDh2TebST4oiAkUs=" }, "modemmanager-qt": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/modemmanager-qt-6.13.0.tar.xz", - "hash": "sha256-Je/TMsFq+PWNwzXowlnsPBOz5en0wq6tuH7KVi0029A=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/modemmanager-qt-6.14.0.tar.xz", + "hash": "sha256-wfA6TfGMKMQlQLpZ2fm5li1Z9AdM32hrx4fi/1lXg9k=" }, "networkmanager-qt": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/networkmanager-qt-6.13.0.tar.xz", - "hash": "sha256-mp41laG5gWsnN7BBa52St24rDKCYnQ72WpXl+JWsNsE=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/networkmanager-qt-6.14.0.tar.xz", + "hash": "sha256-DDkr30+N2F8UQfZbqTHY9JVBxVZ/I1DHjnsSFDTDsSY=" }, "prison": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/prison-6.13.0.tar.xz", - "hash": "sha256-I8RuKJwn8drLDIMRer3GIbXAv+q0XNGHRksAaPcAA+E=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/prison-6.14.0.tar.xz", + "hash": "sha256-tQRUqwoNeJGsH5tsTk4AzNMmm61jCmo5L0EMTiUv+2Q=" }, "purpose": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/purpose-6.13.0.tar.xz", - "hash": "sha256-K6t0kHUFvulfqs3JyT6KlLKrM2Ual9KufWP9SD9Fgyc=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/purpose-6.14.0.tar.xz", + "hash": "sha256-3Z8juvTEpE8ccffTsL/n+/vN2iAC101LSc2EYxrImek=" }, "qqc2-desktop-style": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/qqc2-desktop-style-6.13.0.tar.xz", - "hash": "sha256-qKWozjQ+p3yx0LMAwS6GgpyRPgNsb/itXSG4+WIYQmo=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/qqc2-desktop-style-6.14.0.tar.xz", + "hash": "sha256-lgSzXLVTlhxGRt3KaeIH30L/etnj4WCDh/+SPY2fPP8=" }, "solid": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/solid-6.13.0.tar.xz", - "hash": "sha256-VBnxGKmkXVx2qOK3G9K+Ox37UxP8JkSEu7ocLkRkBR8=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/solid-6.14.0.tar.xz", + "hash": "sha256-AJlvBjR4hj/mG5AtIMlsnrT0rEM1Plm3ebRm+mKxqMQ=" }, "sonnet": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/sonnet-6.13.0.tar.xz", - "hash": "sha256-1HRlqdYjJXz7AZLDpNwkczSQqolSMQQi5ALYKK1GHu4=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/sonnet-6.14.0.tar.xz", + "hash": "sha256-oN5kwTLAjUmGsA3p7o4plhWtUACLFOJpEPzvytc0r9M=" }, "syndication": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/syndication-6.13.0.tar.xz", - "hash": "sha256-H+B6WBcFZZdT+ZWn7gmXe/UosCCmWXg0m5cihi2gj7c=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/syndication-6.14.0.tar.xz", + "hash": "sha256-FOWsb2MtwwIvajK5yOW9AIlr3aX62FhXRQI7JTlWGhk=" }, "syntax-highlighting": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/syntax-highlighting-6.13.0.tar.xz", - "hash": "sha256-1vGbuIbW4cclHYE0l/FOzJ2sQTJTdk62Go86g2gGRQ0=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/syntax-highlighting-6.14.0.tar.xz", + "hash": "sha256-39wCWslop9DLQwgm5U8+lrTKh5jP9LXfffST4tDk37w=" }, "threadweaver": { - "version": "6.13.0", - "url": "mirror://kde/stable/frameworks/6.13/threadweaver-6.13.0.tar.xz", - "hash": "sha256-ZKFi9J/SUmPdmSs+cIVLens7zRURS7ZwlbtRPECX45o=" + "version": "6.14.0", + "url": "mirror://kde/stable/frameworks/6.14/threadweaver-6.14.0.tar.xz", + "hash": "sha256-qPcffml1Hjbbx/zpWB9VtmhEvGjfavLoqUwiyP6YcK4=" } } \ No newline at end of file From 97e31685830ef35353d19527d0e26b0ce5611251 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 10 May 2025 10:45:12 +0200 Subject: [PATCH 62/90] python313Packages.archinfo: 9.2.153 -> 9.2.154 Diff: https://github.com/angr/archinfo/compare/refs/tags/v9.2.153...refs/tags/v9.2.154 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 85d55cc13c75..765aff9a1a05 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.153"; + version = "9.2.154"; pyproject = true; disabled = pythonOlder "3.12"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; tag = "v${version}"; - hash = "sha256-FIr/A8dihHa2T+SQ4b+8Yk9h8ToCEkGGEMbzS/re5ao="; + hash = "sha256-Vks7Rjd8x2zeHnJPs0laH56S4b8pnR1cK82SpK+XOgE="; }; build-system = [ setuptools ]; From 3126a3ed3c3dd2eb10b1b6097ad9bb9766eda65b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 10 May 2025 10:45:18 +0200 Subject: [PATCH 63/90] python313Packages.ailment: 9.2.153 -> 9.2.154 Diff: https://github.com/angr/ailment/compare/refs/tags/v9.2.153...refs/tags/v9.2.154 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 81052105ae98..9f71bf60a545 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.153"; + version = "9.2.154"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; tag = "v${version}"; - hash = "sha256-CigfIFKoZu/mggPMLr5FTRvWqZ6ikP8701hDgck2I3o="; + hash = "sha256-JjS+jYWrbErkb6uM0DtB5h2ht6ZMmiYOQL/Emm6wC5U="; }; build-system = [ setuptools ]; From 5bcdd6697ccce85351355cd70e3446a27e503f3f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 10 May 2025 10:46:23 +0200 Subject: [PATCH 64/90] python313Packages.pyvex: 9.2.153 -> 9.2.154 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index dd4c108edb80..f7a50e0a3e5a 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.153"; + version = "9.2.154"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-K0m8FFWIQP9qoKX6a5Wr+ZAB6+M8DDlEtPRJBHhS24M="; + hash = "sha256-a3ei2w66v18QKAofpPvDUoM42zHRHPrNQic+FE+rLKY="; }; build-system = [ setuptools ]; From c7d519193d30ddbe042becd75aa1691f8707f75a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 10 May 2025 10:46:36 +0200 Subject: [PATCH 65/90] python313Packages.claripy: 9.2.153 -> 9.2.154 Diff: https://github.com/angr/claripy/compare/refs/tags/v9.2.153...refs/tags/v9.2.154 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 917803f20c4c..e68e7d869d60 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.153"; + version = "9.2.154"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; tag = "v${version}"; - hash = "sha256-M3rUBZBA8WbvLU0VJb9H2pQU2PePBhqkpM6OsS20Uj4="; + hash = "sha256-90JX+VDWK/yKhuX6D8hbLxjIOS8vGKrN1PKR8iWjt2o="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail From 1a4a32bd335a0e85f55f09c92cfe1b0abae7f732 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 10 May 2025 10:47:35 +0200 Subject: [PATCH 66/90] python313Packages.cle: 9.2.153 -> 9.2.154 --- pkgs/development/python-modules/cle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 8906d5da75ac..682232b5bf1a 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -17,14 +17,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.153"; + version = "9.2.154"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-KvCYnvyFjQdGeNe89ylTDkYrs7RhSeT5RcTRvg9BsQE="; + hash = "sha256-XXJBySIT3ylK1nd3suP2bq4bVSVah/1XhOmkEONbCoY="; }; in buildPythonPackage rec { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-MHQZfRmtq3kueJWOGX06B7W3LLyLReuUcb0D1dy7DMQ="; + hash = "sha256-rWbZzm5hWi/C+te8zeQChxqYHO0S795tJ6Znocq9TTs="; }; build-system = [ setuptools ]; From d00b194428f7ce1eda3e0b07d6a14e45484abf49 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 10 May 2025 10:49:38 +0200 Subject: [PATCH 67/90] python312Packages.angr: 9.2.153 -> 9.2.154 Diff: https://github.com/angr/angr/compare/refs/tags/v9.2.153...refs/tags/v9.2.154 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index ab6928dca909..170e8a92b48e 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.153"; + version = "9.2.154"; pyproject = true; disabled = pythonOlder "3.11"; @@ -47,7 +47,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; tag = "v${version}"; - hash = "sha256-j/VcfsRrw8Et92olT5aKkpkaEZ7YksBCokQBziAKLvI="; + hash = "sha256-aOgZXHk6GTWZAEraZQahEXUYs8LWAWv1n9GfX+2XTPU="; }; pythonRelaxDeps = [ "capstone" ]; From 1b36d05438cedb5faa81f6442aab793d7707d8c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 10 May 2025 10:54:18 +0200 Subject: [PATCH 68/90] python313Packages.cyclopts: 3.15.0 -> 3.16.0 Diff: https://github.com/BrianPugh/cyclopts/compare/refs/tags/v3.15.0...refs/tags/v3.16.0 Changelog: https://github.com/BrianPugh/cyclopts/releases/tag/v3.16.0 --- pkgs/development/python-modules/cyclopts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index 5ccc4bbadcf6..d580a343dcd3 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "cyclopts"; - version = "3.15.0"; + version = "3.16.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "BrianPugh"; repo = "cyclopts"; tag = "v${version}"; - hash = "sha256-APg6Z1atVgkWy0/Gf30l7XrLZtxevt6Hj4z4ytKiy/0="; + hash = "sha256-5njodmW28F1l9CO/FymNBh4wEsNNtJl74yBSucAH1EI="; }; build-system = [ From b8743c7bf38f84bf13b143b1c6de22f89b0fba32 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 10 May 2025 10:57:24 +0200 Subject: [PATCH 69/90] python313Packages.easyenergy: 2.1.2 -> 2.2.0 Changelog: https://github.com/klaasnicolaas/python-easyenergy/releases/tag/v2.2.0 --- .../python-modules/easyenergy/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/easyenergy/default.nix b/pkgs/development/python-modules/easyenergy/default.nix index 9800a9a7d9d7..86a6c19739eb 100644 --- a/pkgs/development/python-modules/easyenergy/default.nix +++ b/pkgs/development/python-modules/easyenergy/default.nix @@ -6,15 +6,17 @@ fetchFromGitHub, poetry-core, pytest-asyncio, + pytest-cov-stub, pytest-freezer, pytestCheckHook, pythonOlder, + syrupy, yarl, }: buildPythonPackage rec { pname = "easyenergy"; - version = "2.1.2"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,13 +25,12 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-easyenergy"; tag = "v${version}"; - hash = "sha256-tWKfcGznxck8VLK3YshOIbPet2CEbUZbT8JzgaAhAso="; + hash = "sha256-AFEygSSHr7YJK4Yx4dvBVGR3wBswAeUNrC/7NndzfBg="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace '"0.0.0"' '"${version}"' \ - --replace 'addopts = "--cov"' "" + --replace '"0.0.0"' '"${version}"' ''; nativeBuildInputs = [ poetry-core ]; @@ -42,8 +43,10 @@ buildPythonPackage rec { nativeCheckInputs = [ aresponses pytest-asyncio + pytest-cov-stub pytest-freezer pytestCheckHook + syrupy ]; pythonImportsCheck = [ "easyenergy" ]; @@ -66,8 +69,8 @@ buildPythonPackage rec { meta = with lib; { description = "Module for getting energy/gas prices from easyEnergy"; homepage = "https://github.com/klaasnicolaas/python-easyenergy"; - changelog = "https://github.com/klaasnicolaas/python-easyenergy/releases/tag/v${version}"; - license = with licenses; [ mit ]; + changelog = "https://github.com/klaasnicolaas/python-easyenergy/releases/tag/${src.tag}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From b93976ee6df2bcc70a71ecf7318a7bbf9fb95334 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 May 2025 08:58:46 +0000 Subject: [PATCH 70/90] antimatter-dimensions: 0-unstable-2024-10-16 -> 0-unstable-2025-05-08 --- pkgs/by-name/an/antimatter-dimensions/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/antimatter-dimensions/package.nix b/pkgs/by-name/an/antimatter-dimensions/package.nix index 9e40ab88bf29..2a70d2d9722c 100644 --- a/pkgs/by-name/an/antimatter-dimensions/package.nix +++ b/pkgs/by-name/an/antimatter-dimensions/package.nix @@ -19,12 +19,12 @@ let in buildNpmPackage rec { pname = "antimatter-dimensions"; - version = "0-unstable-2024-10-16"; + version = "0-unstable-2025-05-08"; src = fetchFromGitHub { owner = "IvarK"; repo = "AntimatterDimensionsSourceCode"; - rev = "b813542c2f77501d0b8d07ae8b0044df2a994e86"; - hash = "sha256-1uZeY0Lgqbo9X9xbXed0aYy8mNApMBXJRlaoliZb/mA="; + rev = "7b29fa1c0771b93a8bf8198ca04886167ecffc0b"; + hash = "sha256-z7dVToxu8qWCPajf0vKprXF4zSBCRDquBgjf55ZPgyE="; }; nativeBuildInputs = [ copyDesktopItems From 64ddb9b040f959a95eba733caf9d5fbbfdd6e8d1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 10 May 2025 10:59:38 +0200 Subject: [PATCH 71/90] python313Packages.holidays: 0.71 -> 0.72 Diff: https://github.com/vacanza/python-holidays/compare/refs/tags/v0.71...refs/tags/v0.72 Changelog: https://github.com/vacanza/python-holidays/releases/tag/v0.72 --- pkgs/development/python-modules/holidays/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 5be98a23ea4e..3941658f9b98 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.71"; + version = "0.72"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; tag = "v${version}"; - hash = "sha256-umfwSIi9Vu3fDvSVbq3cbQZ83q925VwxVPHedzrcqag="; + hash = "sha256-WkmB0jzNai7iCpSAJBzeRhtTDa+E74K8ebMiPIImXS0="; }; build-system = [ From 5b52f2715260457e07fc20eed2e5f59a5e5616b5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 10 May 2025 11:05:21 +0200 Subject: [PATCH 72/90] python313Packages.modbus-tk: 1.1.4 -> 1.1.5 --- pkgs/development/python-modules/modbus-tk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/modbus-tk/default.nix b/pkgs/development/python-modules/modbus-tk/default.nix index d56deb1ff34d..b02aa6a0c9c0 100644 --- a/pkgs/development/python-modules/modbus-tk/default.nix +++ b/pkgs/development/python-modules/modbus-tk/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "modbus-tk"; - version = "1.1.4"; + version = "1.1.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "modbus_tk"; inherit version; - hash = "sha256-aJd3ZusQRplz3VaigUvZgbhd0YC3kEMkh4bYgAjyWTs="; + hash = "sha256-d6cqOtnV0yodIRC8BCFmgMpX11IpEuDycem/XxtwGzY="; }; build-system = [ setuptools ]; From 5f48f53a303d41a116b1241022fa79d055983b5a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 10 May 2025 11:05:57 +0200 Subject: [PATCH 73/90] python313Packages.types-awscrt: 0.26.1 -> 0.27.1 Changelog: https://github.com/youtype/types-awscrt/releases/tag/0.27.1 --- pkgs/development/python-modules/types-awscrt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index 7eed932da6eb..f7a3a6ed4a96 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.26.1"; + version = "0.27.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-rKlviJs3RcDnT0Lwjyd/7Tv26bqiz5sGo29413cg5QQ="; + hash = "sha256-PCvuUu5FAi2q9PEG1dG18P8Kjj5gk92mX1MVt2abxBg="; }; build-system = [ setuptools ]; From 42dba13fa6c671929accc32041c9299f2bf6d8ff Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Tue, 15 Apr 2025 14:15:34 +0200 Subject: [PATCH 74/90] coqPackages.mathcomp: 2.3.0 -> 2.4.0 --- pkgs/development/coq-modules/coqeal/default.nix | 2 +- pkgs/development/coq-modules/deriving/default.nix | 4 ++-- pkgs/development/coq-modules/extructures/default.nix | 4 ++-- pkgs/development/coq-modules/graph-theory/default.nix | 4 ++-- pkgs/development/coq-modules/jasmin/default.nix | 2 +- pkgs/development/coq-modules/mathcomp-finmap/default.nix | 2 +- pkgs/development/coq-modules/mathcomp-tarjan/default.nix | 2 +- pkgs/development/coq-modules/mathcomp/default.nix | 5 +++++ pkgs/development/coq-modules/multinomials/default.nix | 2 +- pkgs/development/coq-modules/reglang/default.nix | 2 +- pkgs/development/coq-modules/ssprove/default.nix | 2 +- 11 files changed, 18 insertions(+), 13 deletions(-) diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix index 08f1ad8c473d..603d2be00601 100644 --- a/pkgs/development/coq-modules/coqeal/default.nix +++ b/pkgs/development/coq-modules/coqeal/default.nix @@ -23,7 +23,7 @@ let [ { cases = [ - (range "9.0" "9.0") + (range "8.20" "9.0") (isGe "2.3.0") ]; out = "2.1.0"; diff --git a/pkgs/development/coq-modules/deriving/default.nix b/pkgs/development/coq-modules/deriving/default.nix index 30cb78815193..6f32bca2aad9 100644 --- a/pkgs/development/coq-modules/deriving/default.nix +++ b/pkgs/development/coq-modules/deriving/default.nix @@ -20,14 +20,14 @@ mkCoqDerivation { { cases = [ (range "8.17" "9.0") - (isGe "2.0.0") + (range "2.0.0" "2.3.0") ]; out = "0.2.1"; } { cases = [ (range "8.17" "8.20") - (isGe "2.0.0") + (range "2.0.0" "2.2.0") ]; out = "0.2.0"; } diff --git a/pkgs/development/coq-modules/extructures/default.nix b/pkgs/development/coq-modules/extructures/default.nix index 270c6146fe3e..6cba886a4349 100644 --- a/pkgs/development/coq-modules/extructures/default.nix +++ b/pkgs/development/coq-modules/extructures/default.nix @@ -20,14 +20,14 @@ { cases = [ (range "8.17" "9.0") - (isGe "2.0.0") + (range "2.0.0" "2.3.0") ]; out = "0.5.0"; } { cases = [ (range "8.17" "8.20") - (isGe "2.0.0") + (range "2.0.0" "2.3.0") ]; out = "0.4.0"; } diff --git a/pkgs/development/coq-modules/graph-theory/default.nix b/pkgs/development/coq-modules/graph-theory/default.nix index 1f0b0eb41f28..4a5e8c914364 100644 --- a/pkgs/development/coq-modules/graph-theory/default.nix +++ b/pkgs/development/coq-modules/graph-theory/default.nix @@ -6,7 +6,7 @@ mathcomp-finmap, mathcomp-algebra-tactics, fourcolor, - hierarchy-builder, + stdlib, version ? null, }: @@ -71,7 +71,7 @@ mkCoqDerivation { mathcomp.fingroup mathcomp-algebra-tactics fourcolor - hierarchy-builder + stdlib ]; meta = with lib; { diff --git a/pkgs/development/coq-modules/jasmin/default.nix b/pkgs/development/coq-modules/jasmin/default.nix index ec542b6815af..73ee3dd6d317 100644 --- a/pkgs/development/coq-modules/jasmin/default.nix +++ b/pkgs/development/coq-modules/jasmin/default.nix @@ -21,7 +21,7 @@ mkCoqDerivation { { cases = [ (range "8.19" "9.0") - (range "2.2" "2.3") + (range "2.2" "2.4") ]; out = "2025.02.0"; } diff --git a/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/pkgs/development/coq-modules/mathcomp-finmap/default.nix index 8e3245c619a1..791fcc40bcbb 100644 --- a/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ b/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -23,7 +23,7 @@ mkCoqDerivation { { cases = [ (range "8.16" "9.0") - (isGe "2.0") + (range "2.0" "2.3") ]; out = "2.1.0"; } diff --git a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix index 9246a0b0682e..1839f52099c3 100644 --- a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix +++ b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix @@ -25,7 +25,7 @@ mkCoqDerivation { { cases = [ (range "8.16" "9.0") - (isGe "2.0.0") + (range "2.0.0" "2.3.0") ]; out = "1.0.2"; } diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index b9cc26880506..963fd6e2b6d2 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -34,6 +34,10 @@ let inherit (lib.versions) range; in lib.switch coq.coq-version [ + { + case = range "8.20" "9.0"; + out = "2.4.0"; + } { case = range "8.19" "9.0"; out = "2.3.0"; @@ -108,6 +112,7 @@ let } ] null; release = { + "2.4.0".sha256 = "sha256-A1XgLLwZRvKS8QyceCkSQa7ue6TYyf5fMft5gSx9NOs="; "2.3.0".sha256 = "sha256-wa6OBig8rhAT4iwupSylyCAMhO69rADa0MQIX5zzL+Q="; "2.2.0".sha256 = "sha256-SPyWSI5kIP5w7VpgnQ4vnK56yEuWnJylNQOT7M77yoQ="; "2.1.0".sha256 = "sha256-XDLx0BIkVRkSJ4sGCIE51j3rtkSGemNTs/cdVmTvxqo="; diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix index 1817d4011199..78baab677937 100644 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -27,7 +27,7 @@ mkCoqDerivation { { cases = [ (range "8.17" "9.0") - (isGe "2.1.0") + (range "2.1.0" "2.3.0") ]; out = "2.3.0"; } diff --git a/pkgs/development/coq-modules/reglang/default.nix b/pkgs/development/coq-modules/reglang/default.nix index fdb9ed07774b..cb1a070d488c 100644 --- a/pkgs/development/coq-modules/reglang/default.nix +++ b/pkgs/development/coq-modules/reglang/default.nix @@ -26,7 +26,7 @@ mkCoqDerivation { { cases = [ (range "8.16" "9.0") - (isGe "2.0.0") + (range "2.0.0" "2.3.0") ]; out = "1.2.1"; } diff --git a/pkgs/development/coq-modules/ssprove/default.nix b/pkgs/development/coq-modules/ssprove/default.nix index c3db4a8be0e5..876a0537cb40 100644 --- a/pkgs/development/coq-modules/ssprove/default.nix +++ b/pkgs/development/coq-modules/ssprove/default.nix @@ -24,7 +24,7 @@ { cases = [ (range "8.18" "8.20") - "2.3.0" + (range "2.3.0" "2.3.0") ]; out = "0.2.3"; } From 935b1cc6babe457211b7821ab267b3155f330b6f Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Wed, 16 Apr 2025 08:57:26 +0200 Subject: [PATCH 75/90] coqPackages.fourcolor: 1.4.0 -> 1.4.1 --- pkgs/development/coq-modules/fourcolor/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/fourcolor/default.nix b/pkgs/development/coq-modules/fourcolor/default.nix index 3768db213bd8..5effd74fc033 100644 --- a/pkgs/development/coq-modules/fourcolor/default.nix +++ b/pkgs/development/coq-modules/fourcolor/default.nix @@ -18,6 +18,7 @@ mkCoqDerivation { release."1.3.0".sha256 = "sha256-h9pa6vaKT6jCEaIdEdcu0498Ou5kEXtZdb9P7WXK1DQ="; release."1.3.1".sha256 = "sha256-wBizm1hJXPYBu0tHFNScQHd22FebsJYoggT5OlhY/zM="; release."1.4.0".sha256 = "sha256-8TtNPEbp3uLAH+MjOKiTZHOjPb3vVYlabuqsdWxbg80="; + release."1.4.1".sha256 = "sha256-0UASpo9CdpvidRv33BDWrevo+NSOhxLQFPCJAWPXf+s="; inherit version; defaultVersion = @@ -30,7 +31,7 @@ mkCoqDerivation { (isGe "8.16") (isGe "2.0") ]; - out = "1.4.0"; + out = "1.4.1"; } { cases = [ From cb817bb9db32a89dbc6b9546f5ee643d4ad6f7d9 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Wed, 16 Apr 2025 09:02:57 +0200 Subject: [PATCH 76/90] coqPackages.mathcomp-real-closed: 2.0.2 -> 2.0.3 --- .../coq-modules/mathcomp-real-closed/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix index 7654c47abf08..522000b7c379 100644 --- a/pkgs/development/coq-modules/mathcomp-real-closed/default.nix +++ b/pkgs/development/coq-modules/mathcomp-real-closed/default.nix @@ -17,6 +17,7 @@ mkCoqDerivation { owner = "math-comp"; inherit version; release = { + "2.0.3".sha256 = "sha256-heZ7aZ7TO9YNAESIvbAc1qqzO91xMyLAox8VKueIk/s="; "2.0.2".sha256 = "sha256-hBo9JMtmXDYBmf5ihKGksQLHv3c0+zDBnd8/aI2V/ao="; "2.0.1".sha256 = "sha256-tQTI3PCl0q1vWpps28oATlzOI8TpVQh1jhTwVmhaZic="; "2.0.0".sha256 = "sha256-sZvfiC5+5Lg4nRhfKKqyFzovCj2foAhqaq/w9F2bdU8="; @@ -35,17 +36,24 @@ mkCoqDerivation { lib.switch [ coq.version mathcomp.version ] [ + { + cases = [ + (range "8.18" "9.0") + (isGe "2.2.0") + ]; + out = "2.0.3"; + } { cases = [ (range "8.17" "9.0") - (isGe "2.1.0") + (range "2.1.0" "2.3.0") ]; out = "2.0.2"; } { cases = [ (range "8.17" "8.20") - (isGe "2.0.0") + (range "2.0.0" "2.2.0") ]; out = "2.0.1"; } From d7fd05259c8c517f9fa2cd60056a3cd7e34bdb06 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Wed, 16 Apr 2025 09:13:29 +0200 Subject: [PATCH 77/90] coqPackages.gaia: 2.2 -> 2.3 --- pkgs/development/coq-modules/gaia/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/coq-modules/gaia/default.nix b/pkgs/development/coq-modules/gaia/default.nix index c10aab6198d8..9dc1865dcea3 100644 --- a/pkgs/development/coq-modules/gaia/default.nix +++ b/pkgs/development/coq-modules/gaia/default.nix @@ -17,6 +17,7 @@ mkCoqDerivation { release."1.15".sha256 = "sha256:04zchnkvaq2mzpcilpspn5l947689gj3m0w20m0nd7w4drvlahnw"; release."1.17".sha256 = "sha256-2VzdopXgKS/wC5Rd1/Zlr12J5bSIGINFjG1nrMjDrGE="; release."2.2".sha256 = "sha256-y8LlQg9d9rfPFjzS9Xu3BW/H3tPiOC+Eb/zwXJGW9d4="; + release."2.3".sha256 = "sha256-inWJok0F3SZpVfoyMfpRXHVHn4z2aY8JjCKKhdVTnoc="; releaseRev = (v: "v${v}"); inherit version; @@ -25,6 +26,13 @@ mkCoqDerivation { lib.switch [ coq.version mathcomp.version ] [ + { + cases = [ + (range "8.16" "9.0") + (range "2.0" "2.4") + ]; + out = "2.3"; + } { cases = [ (range "8.16" "9.0") From 53b178a1f249c934c8f97bf954f93d8ac7093651 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Wed, 16 Apr 2025 16:11:53 +0200 Subject: [PATCH 78/90] coqPackages.odd-order: 2.1.0 -> 2.2.0 --- pkgs/development/coq-modules/odd-order/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/coq-modules/odd-order/default.nix b/pkgs/development/coq-modules/odd-order/default.nix index 26688b4cba6c..504b05508760 100644 --- a/pkgs/development/coq-modules/odd-order/default.nix +++ b/pkgs/development/coq-modules/odd-order/default.nix @@ -9,6 +9,7 @@ mkCoqDerivation { pname = "odd-order"; owner = "math-comp"; + release."2.2.0".sha256 = "sha256-z0C7+wtY8NpoT8wYqHiy8mB2HPYAeJndzDmf7Bb0mg8="; release."2.1.0".sha256 = "sha256-TPlaQbO0yXEpUgy3rlCx/w1MSLECJk5tdU26fAGe48Q="; release."1.14.0".sha256 = "0iln70npkvixqyz469l6nry545a15jlaix532i1l7pzfkqqn6v68"; release."1.13.0".sha256 = "sha256-EzNKR/JzM8T17sMhPhgZNs14e50X4dY3OwFi133IsT0="; @@ -19,6 +20,10 @@ mkCoqDerivation { defaultVersion = with lib.versions; lib.switch mathcomp.character.version [ + { + case = (range "2.2.0" "2.4.0"); + out = "2.2.0"; + } { case = (range "2.1.0" "2.3.0"); out = "2.1.0"; From bc49669183cd94533ad347eb97309642ff714eda Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Wed, 16 Apr 2025 16:19:14 +0200 Subject: [PATCH 79/90] coqPackages.finmap: 2.1.0 -> 2.2.0 --- pkgs/development/coq-modules/mathcomp-finmap/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/pkgs/development/coq-modules/mathcomp-finmap/default.nix index 791fcc40bcbb..0d761eac6bcf 100644 --- a/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ b/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -20,6 +20,13 @@ mkCoqDerivation { lib.switch [ coq.version mathcomp-boot.version ] [ + { + cases = [ + (range "8.20" "9.0") + (range "2.3" "2.4") + ]; + out = "2.2.0"; + } { cases = [ (range "8.16" "9.0") @@ -93,6 +100,7 @@ mkCoqDerivation { ] null; release = { + "2.2.0".sha256 = "sha256-oDQEZOutrJxmN8FvzovUIhqw0mwc8Ej7thrieJrW8BY="; "2.1.0".sha256 = "sha256-gh0cnhdVDyo+D5zdtxLc10kGKQLQ3ITzHnMC45mCtpY="; "2.0.0".sha256 = "sha256-0Wr1ZUYVuZH74vawO4EZlZ+K3kq+s1xEz/BfzyKj+wk="; "1.5.2".sha256 = "sha256-0KmmSjc2AlUo6BKr9RZ4FjL9wlGISlTGU0X1Eu7l4sw="; From 1119b1569d17206c0e28af73df3c4b7e18846da7 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Wed, 16 Apr 2025 16:54:06 +0200 Subject: [PATCH 80/90] coqPackages.multinomials: 2.3.0 -> 2.4.0 --- pkgs/development/coq-modules/multinomials/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix index 78baab677937..93dcf55a6ab2 100644 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -24,6 +24,13 @@ mkCoqDerivation { lib.switch [ coq.version mathcomp.version ] [ + { + cases = [ + (range "8.18" "9.0") + (range "2.1.0" "2.4.0") + ]; + out = "2.4.0"; + } { cases = [ (range "8.17" "9.0") @@ -111,6 +118,7 @@ mkCoqDerivation { ] null; release = { + "2.4.0".sha256 = "sha256-7zfIddRH+Sl4nhEPtS/lMZwRUZI45AVFpcC/UC8Z0Yo="; "2.3.0".sha256 = "sha256-usIcxHOAuN+f/j3WjVbPrjz8Hl9ac8R6kYeAKi3CEts="; "2.2.0".sha256 = "sha256-Cie6paweITwPZy6ej9+qIvHFWknVR382uJPW927t/fo="; "2.1.0".sha256 = "sha256-QT91SBJ6DXhyg4j/okTvPP6yj2DnnPbnSlJ/p8pvZbY="; From 0d66b5655675b829b02afe73d2535dabcd6c69d8 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Fri, 18 Apr 2025 09:17:55 +0200 Subject: [PATCH 81/90] coqPackages.graph-theory: 0.9.4 -> 0.9.6 --- pkgs/development/coq-modules/graph-theory/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/coq-modules/graph-theory/default.nix b/pkgs/development/coq-modules/graph-theory/default.nix index 4a5e8c914364..b07e5dff78e3 100644 --- a/pkgs/development/coq-modules/graph-theory/default.nix +++ b/pkgs/development/coq-modules/graph-theory/default.nix @@ -18,6 +18,7 @@ mkCoqDerivation { release."0.9.2".sha256 = "sha256-DPYCZS8CzkfgpR+lmYhV2v20ezMtyWp8hdWpuh0OOQU="; release."0.9.3".sha256 = "sha256-9WX3gsw+4btJLqcGg2W+7Qy+jaZtkfw7vCp8sXYmaWw="; release."0.9.4".sha256 = "sha256-fXTAsRdPisNhg8Umaa7S7gZ1M8zuPGg426KP9fAkmXQ="; + release."0.9.6".sha256 = "sha256-fvGb970tRE4xj1pBIhNBDaqssDd6kNQ/+s0c+aOO5IE="; releaseRev = v: "v${v}"; @@ -27,6 +28,13 @@ mkCoqDerivation { lib.switch [ coq.coq-version mathcomp.version ] [ + { + cases = [ + (range "8.18" "9.0") + (range "2.0.0" "2.4.0") + ]; + out = "0.9.6"; + } { cases = [ (range "8.16" "8.19") From d87c87358f908d516ebf9d90f4d0be2c4ad76363 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Fri, 18 Apr 2025 09:18:26 +0200 Subject: [PATCH 82/90] coqPackages.deriving: 0.2.1 -> 0.2.2 --- pkgs/development/coq-modules/deriving/default.nix | 8 ++++++++ pkgs/development/coq-modules/extructures/default.nix | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/deriving/default.nix b/pkgs/development/coq-modules/deriving/default.nix index 6f32bca2aad9..9f20bdc3b335 100644 --- a/pkgs/development/coq-modules/deriving/default.nix +++ b/pkgs/development/coq-modules/deriving/default.nix @@ -17,6 +17,13 @@ mkCoqDerivation { lib.switch [ coq.coq-version ssreflect.version ] [ + { + cases = [ + (range "8.17" "9.0") + (range "2.0.0" "2.4.0") + ]; + out = "0.2.2"; + } { cases = [ (range "8.17" "9.0") @@ -43,6 +50,7 @@ mkCoqDerivation { releaseRev = v: "v${v}"; + release."0.2.2".sha256 = "sha256-qsbyQ4spg5vVLZkechb2LoBazGjMh7pR9sSS0s7tXxs="; release."0.2.1".sha256 = "sha256-053bNa3rcy0fCs9CQoKPxDLXnKRHzteyClLDURpaZJo="; release."0.2.0".sha256 = "sha256-xPsuEayHstjF0PGFJZJ+5cm0oMUrpoGLXN23op97vjM="; release."0.1.1".sha256 = "sha256-Gu8aInLxTXfAFE0/gWRYI046Dx3Gv1j1+gx92v/UnPI="; diff --git a/pkgs/development/coq-modules/extructures/default.nix b/pkgs/development/coq-modules/extructures/default.nix index 6cba886a4349..e57da9deb4f7 100644 --- a/pkgs/development/coq-modules/extructures/default.nix +++ b/pkgs/development/coq-modules/extructures/default.nix @@ -20,7 +20,7 @@ { cases = [ (range "8.17" "9.0") - (range "2.0.0" "2.3.0") + (range "2.0.0" "2.4.0") ]; out = "0.5.0"; } From 5f5e129328e807b3aa981fe2e66909a7d9554870 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Mon, 21 Apr 2025 21:04:33 +0200 Subject: [PATCH 83/90] coqPackages.mathcomp-analysis: 1.9.0 -> 1.11.0 --- .../development/coq-modules/mathcomp-analysis/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix index 419a8d689350..02103c2eb986 100644 --- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -16,6 +16,7 @@ let repo = "analysis"; owner = "math-comp"; + release."1.11.0".sha256 = "sha256-1apbzBvaLNw/8ARLUhGGy89CyXW+/6O4ckdxKPraiVc="; release."1.9.0".sha256 = "sha256-zj7WSDUg8ISWxcipGpjEwvvnLp1g8nm23BZiib/15+g="; release."1.8.0".sha256 = "sha256-2ZafDmZAwGB7sxdUwNIE3xvwBRw1kFDk0m5Vz+onWZc="; release."1.7.0".sha256 = "sha256-GgsMIHqLkWsPm2VyOPeZdOulkN00IoBz++qA6yE9raQ="; @@ -49,6 +50,13 @@ let lib.switch [ coq.version mathcomp.version ] [ + { + cases = [ + (range "8.20" "9.0") + (range "2.1.0" "2.4.0") + ]; + out = "1.11.0"; + } { cases = [ (range "8.19" "8.20") From c374d60d5f44c8e45880db950df1dc6f1ff35819 Mon Sep 17 00:00:00 2001 From: Cyril Cohen Date: Mon, 14 Apr 2025 13:49:47 +0200 Subject: [PATCH 84/90] coqPackages.ssprove: fix ssprove now depends on mathcomp-word --- pkgs/development/coq-modules/ssprove/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/coq-modules/ssprove/default.nix b/pkgs/development/coq-modules/ssprove/default.nix index 876a0537cb40..6212990e8cc4 100644 --- a/pkgs/development/coq-modules/ssprove/default.nix +++ b/pkgs/development/coq-modules/ssprove/default.nix @@ -9,6 +9,7 @@ mathcomp-experimental-reals, extructures, deriving, + mathcomp-word, }: (mkCoqDerivation { @@ -67,6 +68,7 @@ mathcomp-experimental-reals extructures deriving + mathcomp-word ]; meta = with lib; { From 94394c3309606c1eff278b5f75a04a2f467e1bfd Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Tue, 22 Apr 2025 18:40:03 +0200 Subject: [PATCH 85/90] coqPackages.ssprove: 0.2.3 -> 0.2.4 --- pkgs/development/coq-modules/ssprove/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/coq-modules/ssprove/default.nix b/pkgs/development/coq-modules/ssprove/default.nix index 6212990e8cc4..b1a26558a0bd 100644 --- a/pkgs/development/coq-modules/ssprove/default.nix +++ b/pkgs/development/coq-modules/ssprove/default.nix @@ -22,6 +22,13 @@ lib.switch [ coq.coq-version mathcomp-boot.version ] [ + { + cases = [ + (range "8.18" "9.0") + (range "2.3.0" "2.4.0") + ]; + out = "0.2.4"; + } { cases = [ (range "8.18" "8.20") @@ -55,6 +62,7 @@ releaseRev = v: "v${v}"; + release."0.2.4".sha256 = "sha256-uglr47aDgSkKi2JyVyN+2BrokZISZUAE8OUylGjy7ds="; release."0.2.3".sha256 = "sha256-Y3dmNIF36IuIgrVILteofOv8e5awKfq93S4YN7enswI="; release."0.2.2".sha256 = "sha256-tBF8equJd6hKZojpe+v9h6Tg9xEnMTVFgOYK7ZnMfxk="; release."0.2.1".sha256 = "sha256-X00q5QFxdcGWeNqOV/PLTOqQyyfqFEinbGUTO7q8bC4="; From 0e63dbec831f7650b695ad6a6d587608b0a110f8 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Wed, 23 Apr 2025 13:27:01 +0200 Subject: [PATCH 86/90] coqPackages.reglang: 1.2.1 -> 1.2.2 --- pkgs/development/coq-modules/reglang/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/coq-modules/reglang/default.nix b/pkgs/development/coq-modules/reglang/default.nix index cb1a070d488c..cb00b6f48991 100644 --- a/pkgs/development/coq-modules/reglang/default.nix +++ b/pkgs/development/coq-modules/reglang/default.nix @@ -12,6 +12,7 @@ mkCoqDerivation { releaseRev = v: "v${v}"; + release."1.2.2".sha256 = "sha256-js1JaLSpYbxfiAfh8XvGsnJpx5DV13heouUm3oeBfNg="; release."1.2.1".sha256 = "sha256-giCRK8wzpVVzXAkFAieQDWqSsP7upSJSUUHkwG4QqO4="; release."1.2.0".sha256 = "sha256-gSqQ7D2HLwM4oYopTWkMFYfYXxsH/7VxI3AyrLwNf3o="; release."1.1.3".sha256 = "sha256-kaselYm8K0JBsTlcI6K24m8qpv8CZ9+VNDJrOtFaExg="; @@ -23,6 +24,13 @@ mkCoqDerivation { lib.switch [ coq.coq-version mathcomp.version ] [ + { + cases = [ + (range "8.16" "9.0") + (range "2.0.0" "2.4.0") + ]; + out = "1.2.2"; + } { cases = [ (range "8.16" "9.0") From 3591786efeecb236bbb0878a68b249eda9618e2a Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Fri, 9 May 2025 18:28:33 +0200 Subject: [PATCH 87/90] coqPackages.mathcomp-tarjan: 1.0.2 -> 1.0.3 --- pkgs/development/coq-modules/mathcomp-tarjan/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix index 1839f52099c3..4f8549c00f89 100644 --- a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix +++ b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix @@ -22,6 +22,13 @@ mkCoqDerivation { lib.switch [ coq.version mathcomp-ssreflect.version ] [ + { + cases = [ + (range "8.16" "9.0") + (range "2.0.0" "2.4.0") + ]; + out = "1.0.3"; + } { cases = [ (range "8.16" "9.0") @@ -45,6 +52,7 @@ mkCoqDerivation { } ] null; + release."1.0.3".sha256 = "sha256-5lpOCDyH6NFzGLvnXHHAnR7Qv5oXsUyC8TLBFrIiBag="; release."1.0.2".sha256 = "sha256-U20xgA+e9KTRdvILD1cxN6ia+dlA8uBTIbc4QlKz9ss="; release."1.0.1".sha256 = "sha256-utNjFCAqC5xOuhdyKhfMZkRYJD0xv9Gt6U3ZdQ56mek="; release."1.0.0".sha256 = "sha256:0r459r0makshzwlygw6kd4lpvdjc43b3x5y9aa8x77f2z5gymjq1"; From 9cac65b6dbae178e1bd87b0ca7545db76d85a45a Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Fri, 9 May 2025 21:27:06 +0200 Subject: [PATCH 88/90] coqPackages.mathcomp-algebra-tactics: 1.2.4 -> 1.2.5 --- .../coq-modules/mathcomp-algebra-tactics/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix index 3ea3a67f390b..89e53c0e0f64 100644 --- a/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix +++ b/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix @@ -23,6 +23,13 @@ mkCoqDerivation { lib.switch [ coq.coq-version mathcomp-algebra.version ] [ + { + cases = [ + (range "8.20" "9.0") + (isGe "2.4") + ]; + out = "1.2.5"; + } { cases = [ (range "8.16" "9.0") @@ -59,6 +66,7 @@ mkCoqDerivation { release."1.2.2".sha256 = "sha256-EU9RJGV3BvnmsX+mGH+6+MDXiGHgDI7aP5sIYiMUXTs="; release."1.2.3".sha256 = "sha256-6uc1VEfDv+fExEfBR2c0/Q/KjrkX0TbEMCLgeYcpkls="; release."1.2.4".sha256 = "sha256-BRxt0LGPz2u3kJRjcderaZqCfs8M8qKAAwNSWmIck7Q="; + release."1.2.5".sha256 = "sha256-wTfe+g7ljWs1S+g02VQutnJGLVIOzNX1lm1HTMXeUUA="; propagatedBuildInputs = [ mathcomp-ssreflect From 3bb8fa02e657bf0d87727ccab12e30c2e11a057b Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Fri, 9 May 2025 18:25:37 +0200 Subject: [PATCH 89/90] coqPackages.mathcomp-infotheo: 0.9.1 -> 0.9.3 --- .../development/coq-modules/mathcomp-infotheo/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix index 9f791ce654bf..c1f8d149c605 100644 --- a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix +++ b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix @@ -23,6 +23,13 @@ lib.switch [ coq.version mathcomp-analysis.version ] [ + { + cases = [ + (range "8.20" "8.20") + (isGe "1.10") + ]; + out = "0.9.3"; + } { cases = [ (range "8.19" "8.20") @@ -88,6 +95,7 @@ } ] null; + release."0.9.3".sha256 = "sha256-8+cnVKNAvZ3MVV3BpS8UmCIxJphsQRBv3swek1eEBjE="; release."0.9.1".sha256 = "sha256-WI20HxMHr1ZUwOGPIUl+nRI8TxVUa2+F1xcGjRDHO9g="; release."0.7.7".sha256 = "sha256-kEbpMl7U+I2kvqi1VrjhIVFkZFO6h0tTHEUZRbHYG7E="; release."0.7.5".sha256 = "sha256-pzPo+Acjx3vlyqOkSZQ8uT2BDLSTfbAnRm39e+/CqE0="; From 14753ecd70e12a8a854c5be7eda47c64fb80ecbf Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Sat, 10 May 2025 12:17:00 +0200 Subject: [PATCH 90/90] n98-magerun2: use php 8.3 --- pkgs/by-name/n9/n98-magerun2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/n9/n98-magerun2/package.nix b/pkgs/by-name/n9/n98-magerun2/package.nix index 1453c2128862..1856863cf74d 100644 --- a/pkgs/by-name/n9/n98-magerun2/package.nix +++ b/pkgs/by-name/n9/n98-magerun2/package.nix @@ -1,11 +1,11 @@ { lib, fetchFromGitHub, - php, + php83, versionCheckHook, }: -php.buildComposerProject2 (finalAttrs: { +php83.buildComposerProject2 (finalAttrs: { pname = "n98-magerun2"; version = "8.0.0";