From 23eb34822d486b5a3b2febc3ab0d4703da81f001 Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Wed, 23 Apr 2025 18:23:32 -0300 Subject: [PATCH 001/115] zenergy: 0-unstable-2024-10-10 -> 0-unstable-2025-04-15 Adds Zen 5 support. --- pkgs/os-specific/linux/zenergy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/zenergy/default.nix b/pkgs/os-specific/linux/zenergy/default.nix index d78c02e0dd2d..bc2c90746682 100644 --- a/pkgs/os-specific/linux/zenergy/default.nix +++ b/pkgs/os-specific/linux/zenergy/default.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation { pname = "zenergy"; - version = "0-unstable-2024-10-10"; + version = "0-unstable-2025-04-15"; src = fetchFromGitHub { owner = "BoukeHaarsma23"; repo = "zenergy"; - rev = "7c4e83d5e2f887f4c31edaf92e5f94e9448e9764"; - hash = "sha256-5fYelEr4IYnuXrly15IcyicFrF0tYjs7OBqIhUYQXZ0="; + rev = "f77293fc4aa8c2f5645b2d05d8f0d476220cba9a"; + hash = "sha256-T9ualNYna2Ip19dqz1mOcFWX5oKWIhf9SGMaXovS8QE="; }; nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; @@ -41,6 +41,6 @@ stdenv.mkDerivation { homepage = "https://github.com/BoukeHaarsma23/zenergy"; license = licenses.gpl2Only; maintainers = with maintainers; [ wizardlink ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } From be16ca643fd3ef82388eb15cd7a26c9449f9a48d Mon Sep 17 00:00:00 2001 From: emaryn Date: Fri, 9 May 2025 11:33:08 +0800 Subject: [PATCH 002/115] multipath-tools: 0.9.8 -> 0.11.1 Diff: https://github.com/opensvc/multipath-tools/compare/refs/tags/0.9.8...refs/tags/0.11.1 --- pkgs/by-name/mu/multipath-tools/package.nix | 36 ++++++--------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/pkgs/by-name/mu/multipath-tools/package.nix b/pkgs/by-name/mu/multipath-tools/package.nix index d2855287fe30..8953a7c6913d 100644 --- a/pkgs/by-name/mu/multipath-tools/package.nix +++ b/pkgs/by-name/mu/multipath-tools/package.nix @@ -2,8 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, - coreutils, perl, pkg-config, @@ -21,37 +19,22 @@ nixosTests, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "multipath-tools"; - version = "0.9.8"; + version = "0.11.1"; src = fetchFromGitHub { owner = "opensvc"; repo = "multipath-tools"; - tag = version; - sha256 = "sha256-4cby19BjgnmWf7klK1sBgtZnyvo7q3L1uyVPlVoS+uk="; + tag = finalAttrs.version; + hash = "sha256-H5DY15On3mFwUHQhmC9s2thm0TUUIZbXM/Ot2FPL41Y="; }; - patches = [ - # Backport build fix for musl libc 1.2.5 - (fetchpatch { - url = "https://github.com/openSUSE/multipath-tools/commit/e5004de8296cd596aeeac0a61b901e98cf7a69d2.patch"; - hash = "sha256-3Qt8zfrWi9aOdqMObZQaNAaXDmjhvSYrXK7qycC9L1Q="; - }) - ]; - - postPatch = '' - substituteInPlace create-config.mk \ - --replace-fail /bin/echo ${coreutils}/bin/echo - - substituteInPlace multipathd/multipathd.service.in \ - --replace-fail /sbin/multipathd "$out/bin/multipathd" - ''; - nativeBuildInputs = [ perl pkg-config ]; + buildInputs = [ json_c libaio @@ -62,6 +45,7 @@ stdenv.mkDerivation rec { systemd util-linuxMinimal # for libmount ]; + strictDeps = true; makeFlags = [ @@ -83,10 +67,10 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (nixosTests) iscsi-multipath-root; }; - meta = with lib; { + meta = { description = "Tools for the Linux multipathing storage driver"; homepage = "http://christophe.varoqui.free.fr/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; }; -} +}) From 0235c3f34bb3e4cda745e43fab256c496027bf4b Mon Sep 17 00:00:00 2001 From: emaryn Date: Wed, 21 May 2025 06:32:20 +0800 Subject: [PATCH 003/115] patool: 3.1.0 -> 4.0.1 Diff: https://github.com/wummel/patool/compare/refs/tags/3.1.0...refs/tags/4.0.1 --- .../python-modules/patool/default.nix | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/patool/default.nix b/pkgs/development/python-modules/patool/default.nix index 8e868ce3ac2c..c92bf928cd80 100644 --- a/pkgs/development/python-modules/patool/default.nix +++ b/pkgs/development/python-modules/patool/default.nix @@ -1,10 +1,11 @@ { - argcomplete, lib, stdenv, buildPythonPackage, fetchFromGitHub, + setuptools, installShellFiles, + argcomplete, pytestCheckHook, p7zip, cabextract, @@ -40,25 +41,20 @@ let in buildPythonPackage rec { pname = "patool"; - version = "3.1.0"; + version = "4.0.1"; format = "setuptools"; #pypi doesn't have test data src = fetchFromGitHub { owner = "wummel"; - repo = pname; + repo = "patool"; tag = version; - hash = "sha256-mt/GUIRJHB2/Rritc+uNkolZzguYy2G/NKnSKNxKsLk="; + hash = "sha256-KAOJi8vUP9kPa++dLEXf3mwrv1kmV7uDZmtvngPxQ90="; }; - patches = [ - # https://github.com/wummel/patool/pull/173 - ./fix-rar-detection.patch - ]; - postPatch = '' substituteInPlace patoolib/util.py \ - --replace "path = None" 'path = os.environ["PATH"] + ":${lib.makeBinPath compression-utilities}"' + --replace-fail 'path = os.environ.get("PATH", os.defpath)' 'path = os.environ.get("PATH", os.defpath) + ":${lib.makeBinPath compression-utilities}"' ''; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' @@ -68,9 +64,7 @@ buildPythonPackage rec { --zsh <(${argcomplete}/bin/register-python-argcomplete -s zsh $out/bin/patool) ''; - nativeBuildInputs = [ - installShellFiles - ]; + nativeBuildInputs = [ installShellFiles ]; nativeCheckInputs = [ pytestCheckHook ] ++ compression-utilities; @@ -85,11 +79,11 @@ buildPythonPackage rec { "test_p7azip" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_ar" ]; - meta = with lib; { + meta = { description = "portable archive file manager"; mainProgram = "patool"; homepage = "https://wummel.github.io/patool/"; - license = licenses.gpl3; - maintainers = with maintainers; [ marius851000 ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ marius851000 ]; }; } From 71e6fda65f0ce335087fb4fd22bf56fb7c11f1f2 Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Thu, 22 May 2025 12:19:35 +0200 Subject: [PATCH 004/115] libdiscid: modernize The change to fetchFromGitHub necessitates a hash change, as the tarballs being distributed are not equal to the content of the git repository at the tag[1]. [1]: https://github.com/metabrainz/libdiscid/blob/v0.6.5/CMakeLists.txt#L172-L178 --- pkgs/by-name/li/libdiscid/package.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/li/libdiscid/package.nix b/pkgs/by-name/li/libdiscid/package.nix index 3be92789614b..376a680d394a 100644 --- a/pkgs/by-name/li/libdiscid/package.nix +++ b/pkgs/by-name/li/libdiscid/package.nix @@ -1,12 +1,13 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, cmake, pkg-config, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdiscid"; version = "0.6.4"; @@ -15,18 +16,22 @@ stdenv.mkDerivation rec { pkg-config ]; - src = fetchurl { - url = "http://ftp.musicbrainz.org/pub/musicbrainz/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-3V6PHJrq1ELiO3SanMkzY3LmLoitcHmitiiVsDkMsoI="; + src = fetchFromGitHub { + owner = "metabrainz"; + repo = "libdiscid"; + tag = "v${finalAttrs.version}"; + hash = "sha256-oN/qpzdTa5+rD7kwDOW6UCg7bbDOy/AYmP8sv9Q8+Kk="; }; NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework CoreFoundation -framework IOKit"; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "C library for creating MusicBrainz DiscIDs from audio CDs"; - homepage = "http://musicbrainz.org/doc/libdiscid"; + homepage = "https://musicbrainz.org/doc/libdiscid"; maintainers = with maintainers; [ ehmry ]; license = licenses.lgpl21; platforms = platforms.all; }; -} +}) From da6d32b32c2716aeabd5d73f9474df55150fbe09 Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Thu, 22 May 2025 12:20:57 +0200 Subject: [PATCH 005/115] libdiscid: 0.6.4 -> 0.6.5 Changelog: https://raw.githubusercontent.com/metabrainz/libdiscid/refs/tags/v0.6.5/ChangeLog --- pkgs/by-name/li/libdiscid/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libdiscid/package.nix b/pkgs/by-name/li/libdiscid/package.nix index 376a680d394a..d3fca599aa51 100644 --- a/pkgs/by-name/li/libdiscid/package.nix +++ b/pkgs/by-name/li/libdiscid/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libdiscid"; - version = "0.6.4"; + version = "0.6.5"; nativeBuildInputs = [ cmake @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "metabrainz"; repo = "libdiscid"; tag = "v${finalAttrs.version}"; - hash = "sha256-oN/qpzdTa5+rD7kwDOW6UCg7bbDOy/AYmP8sv9Q8+Kk="; + hash = "sha256-lGq2iGt7c4h8HntEPeQcd7X+IykRLm0kvjrLswRWSSs="; }; NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework CoreFoundation -framework IOKit"; From 35eb287841065d28bbd76c05b9e25860aebb4f5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sat, 26 Oct 2024 02:14:00 +0200 Subject: [PATCH 006/115] maintainers: add leana8959 --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8559afabf837..79a5c09826c0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13795,6 +13795,13 @@ githubId = 139; name = "Leah Neukirchen"; }; + leana8959 = { + name = "Léana Chiang"; + email = "leana.jiang+git@icloud.com"; + github = "leana8959"; + githubId = 87855546; + keys = [ { fingerprint = "3659 D5C8 7A4B C5D7 699B 37D8 4E88 7A4C A971 4ADA"; } ]; + }; lebastr = { email = "lebastr@gmail.com"; github = "lebastr"; From c9eddce63eab42d95bbce2073d0eb386f9025dd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sat, 24 May 2025 22:08:45 +0200 Subject: [PATCH 007/115] noto-fonts-cjk-serif: add static option --- .../no/noto-fonts-cjk-serif/package.nix | 19 ++++++++++++++----- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix b/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix index 967a761e1d40..4cac82c83563 100644 --- a/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix +++ b/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, nixosTests, gitUpdater, + static ? false, # whether to build the static version of the font }: stdenvNoCC.mkDerivation rec { @@ -14,13 +15,20 @@ stdenvNoCC.mkDerivation rec { owner = "notofonts"; repo = "noto-cjk"; rev = "Serif${version}"; - hash = "sha256-E+Ic7XhomI6cUa+q77gQvMlaLvy+vgTq4NJ58/nPZtk="; - sparseCheckout = [ "Serif/Variable/OTC" ]; + hash = "sha256-Bwuu64TAnOnqUgLlBsUw/jnv9emngqFBmVn6zEqySlc="; + sparseCheckout = [ + "Serif/OTC" + "Serif/Variable/OTC" + ]; }; - installPhase = '' - install -m444 -Dt $out/share/fonts/opentype/noto-cjk Serif/Variable/OTC/*.otf.ttc - ''; + installPhase = + let + font-path = if static then "Serif/OTC/*.ttc" else "Serif/Variable/OTC/*.otf.ttc"; + in + '' + install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${font-path} + ''; passthru.tests.noto-fonts = nixosTests.noto-fonts; @@ -48,6 +56,7 @@ stdenvNoCC.mkDerivation rec { maintainers = with maintainers; [ mathnerd314 emily + leana8959 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 330e39efac2c..0a4edf37c869 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11723,6 +11723,10 @@ with pkgs; nordic = libsForQt5.callPackage ../data/themes/nordic { }; + noto-fonts-cjk-serif-static = callPackage ../by-name/no/noto-fonts-cjk-serif/package.nix { + static = true; + }; + noto-fonts-lgc-plus = callPackage ../by-name/no/noto-fonts/package.nix { suffix = "-lgc-plus"; variants = [ From cd3f12cbec6db6edf5a192e4691e9f0e4e1d8403 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Sun, 30 Mar 2025 14:07:26 +0200 Subject: [PATCH 008/115] openra: remove devtest Not needed, since current release is newer than devtest. --- pkgs/games/openra/default.nix | 1 - pkgs/games/openra/engines/devtest/default.nix | 8 - pkgs/games/openra/engines/devtest/deps.json | 542 ------------------ 3 files changed, 551 deletions(-) delete mode 100644 pkgs/games/openra/engines/devtest/default.nix delete mode 100644 pkgs/games/openra/engines/devtest/deps.json diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index 83986abc7c9f..19ea60b55c96 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -7,6 +7,5 @@ in { engines = { release = callPackage' ./engines/release; - devtest = callPackage' ./engines/devtest; }; } diff --git a/pkgs/games/openra/engines/devtest/default.nix b/pkgs/games/openra/engines/devtest/default.nix deleted file mode 100644 index 8278b2cef3df..000000000000 --- a/pkgs/games/openra/engines/devtest/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ buildOpenRAEngine }: - -buildOpenRAEngine { - build = "devtest"; - version = "20230414"; - sha256 = "sha256-NU7NEINyrXSkEI5f3q0FLDve1NkNtr0Gww8E8WF9f5A="; - deps = ./deps.json; -} diff --git a/pkgs/games/openra/engines/devtest/deps.json b/pkgs/games/openra/engines/devtest/deps.json deleted file mode 100644 index 80d389379b80..000000000000 --- a/pkgs/games/openra/engines/devtest/deps.json +++ /dev/null @@ -1,542 +0,0 @@ -[ - { - "pname": "DiscordRichPresence", - "version": "1.1.3.18", - "sha256": "0p4bhaggjjfd4gl06yiphqgncxgcq2bws4sjkrw0n2ldf3hgrps3" - }, - { - "pname": "Linguini.Bundle", - "version": "0.4.0", - "sha256": "0zf46vfhkhpirw6zls9y7v5zwgckscy7dk8ns77qvxxw7ir6r6v5" - }, - { - "pname": "Linguini.Shared", - "version": "0.4.0", - "sha256": "1cxjz4rv1jvxqhlyc1ighy16c5vsah3n0mpx7988cf77kqzm3pzs" - }, - { - "pname": "Linguini.Syntax", - "version": "0.3.0", - "sha256": "1qgj6vbdjjl30cqcyn8df30jj15c2ahj7clgb5fwcja47mnw3jd8" - }, - { - "pname": "Microsoft.Extensions.DependencyModel", - "version": "6.0.0", - "sha256": "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "1.1.0", - "sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "1.1.1", - "sha256": "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "5.0.0", - "sha256": "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc" - }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "1.1.0", - "sha256": "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh" - }, - { - "pname": "Microsoft.Win32.Primitives", - "version": "4.3.0", - "sha256": "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq" - }, - { - "pname": "Microsoft.Win32.Registry", - "version": "5.0.0", - "sha256": "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n" - }, - { - "pname": "Mono.Nat", - "version": "3.0.4", - "sha256": "10zvyq60wy02q21dszrk1h3ww23b7bkgjxaapx1ans4d9nwsmlrm" - }, - { - "pname": "MP3Sharp", - "version": "1.0.5", - "sha256": "14h506d27g5j5c374dvw7iwn9sl0p7xp58kk95dacnpkzk0hv8yv" - }, - { - "pname": "Newtonsoft.Json", - "version": "13.0.1", - "sha256": "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb" - }, - { - "pname": "NuGet.CommandLine", - "version": "4.4.1", - "sha256": "1szk5hbw22c1k5747dk95mzsy5vjw7qmvwv1wc9h080h9xzj9aab" - }, - { - "pname": "NVorbis", - "version": "0.10.4", - "sha256": "0l4f3vhqc6ly7s8mszwarszgirz6ywx1rjsr1jx0fdlsjl02x6p9" - }, - { - "pname": "OpenRA-Eluant", - "version": "1.0.20", - "sha256": "0nq52kdpwsvmhxgcv26wajvn3yxd5l89918rnrzxa463hmyb2rmv" - }, - { - "pname": "OpenRA-Freetype6", - "version": "1.0.9", - "sha256": "1i5clsxszmdkhjcdkp9324zidhzp0dsvn7cbcgrnafs18yabjmzq" - }, - { - "pname": "OpenRA-FuzzyLogicLibrary", - "version": "1.0.1", - "sha256": "0kn0b8491srbllkpqvvkml02dkixs18y5hgcalnpbw8l5kkmwvim" - }, - { - "pname": "OpenRA-OpenAL-CS", - "version": "1.0.19", - "sha256": "1ywm3b15qywrxby3s9wjs9flfjq7vld0gqz0xw4psgvz38gdgh7p" - }, - { - "pname": "OpenRA-SDL2-CS", - "version": "1.0.36", - "sha256": "1vywf2bfqkq0mr58gfd5kafv12rri2bzfajajcj8ha9fmhdibj3s" - }, - { - "pname": "Pfim", - "version": "0.10.3", - "sha256": "1myjs99g14q1yj3j5hzhx8ic7i3rqh2mi3qy9gdfzi6n9dlz1b3d" - }, - { - "pname": "rix0rrr.BeaconLib", - "version": "1.0.2", - "sha256": "0f0yi7hp8v6jvhhv7k4whv8hqqxnx15nvbkll4f1ykaa1w2pr754" - }, - { - "pname": "runtime.any.System.Collections", - "version": "4.3.0", - "sha256": "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0" - }, - { - "pname": "runtime.any.System.Diagnostics.Tracing", - "version": "4.3.0", - "sha256": "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn" - }, - { - "pname": "runtime.any.System.Globalization", - "version": "4.3.0", - "sha256": "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x" - }, - { - "pname": "runtime.any.System.Globalization.Calendars", - "version": "4.3.0", - "sha256": "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201" - }, - { - "pname": "runtime.any.System.IO", - "version": "4.3.0", - "sha256": "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x" - }, - { - "pname": "runtime.any.System.Reflection", - "version": "4.3.0", - "sha256": "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly" - }, - { - "pname": "runtime.any.System.Reflection.Primitives", - "version": "4.3.0", - "sha256": "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf" - }, - { - "pname": "runtime.any.System.Resources.ResourceManager", - "version": "4.3.0", - "sha256": "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl" - }, - { - "pname": "runtime.any.System.Runtime", - "version": "4.3.0", - "sha256": "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b" - }, - { - "pname": "runtime.any.System.Runtime.Handles", - "version": "4.3.0", - "sha256": "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x" - }, - { - "pname": "runtime.any.System.Runtime.InteropServices", - "version": "4.3.0", - "sha256": "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19" - }, - { - "pname": "runtime.any.System.Text.Encoding", - "version": "4.3.0", - "sha256": "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3" - }, - { - "pname": "runtime.any.System.Text.Encoding.Extensions", - "version": "4.3.0", - "sha256": "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8" - }, - { - "pname": "runtime.any.System.Threading.Tasks", - "version": "4.3.0", - "sha256": "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va" - }, - { - "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "sha256": "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i" - }, - { - "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "sha256": "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r" - }, - { - "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "sha256": "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3" - }, - { - "pname": "runtime.native.System", - "version": "4.3.0", - "sha256": "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4" - }, - { - "pname": "runtime.native.System.Net.Http", - "version": "4.3.0", - "sha256": "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk" - }, - { - "pname": "runtime.native.System.Security.Cryptography.Apple", - "version": "4.3.0", - "sha256": "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q" - }, - { - "pname": "runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "sha256": "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6" - }, - { - "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "sha256": "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438" - }, - { - "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "sha256": "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj" - }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", - "version": "4.3.0", - "sha256": "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi" - }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "sha256": "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6" - }, - { - "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "sha256": "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1" - }, - { - "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "sha256": "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi" - }, - { - "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "sha256": "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w" - }, - { - "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "sha256": "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c" - }, - { - "pname": "runtime.unix.Microsoft.Win32.Primitives", - "version": "4.3.0", - "sha256": "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id" - }, - { - "pname": "runtime.unix.System.Diagnostics.Debug", - "version": "4.3.0", - "sha256": "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5" - }, - { - "pname": "runtime.unix.System.IO.FileSystem", - "version": "4.3.0", - "sha256": "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix" - }, - { - "pname": "runtime.unix.System.Net.Primitives", - "version": "4.3.0", - "sha256": "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4" - }, - { - "pname": "runtime.unix.System.Private.Uri", - "version": "4.3.0", - "sha256": "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk" - }, - { - "pname": "runtime.unix.System.Runtime.Extensions", - "version": "4.3.0", - "sha256": "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p" - }, - { - "pname": "SharpZipLib", - "version": "1.4.2", - "sha256": "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y" - }, - { - "pname": "StyleCop.Analyzers", - "version": "1.2.0-beta.435", - "sha256": "0dirz0av24ds2k7hgpss15y4wlhwlzz22qdjvkq0n3g3sxcckrsy" - }, - { - "pname": "StyleCop.Analyzers.Unstable", - "version": "1.2.0.435", - "sha256": "1jv4ha4y2c9922n21yf2dvfkmi8qfa8z28gk5zsqdyck08izp9mh" - }, - { - "pname": "System.Buffers", - "version": "4.3.0", - "sha256": "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy" - }, - { - "pname": "System.Buffers", - "version": "4.5.1", - "sha256": "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3" - }, - { - "pname": "System.Collections", - "version": "4.3.0", - "sha256": "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9" - }, - { - "pname": "System.Collections.Concurrent", - "version": "4.3.0", - "sha256": "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8" - }, - { - "pname": "System.Diagnostics.Debug", - "version": "4.3.0", - "sha256": "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y" - }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "4.3.0", - "sha256": "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq" - }, - { - "pname": "System.Diagnostics.Tracing", - "version": "4.3.0", - "sha256": "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4" - }, - { - "pname": "System.Globalization", - "version": "4.3.0", - "sha256": "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki" - }, - { - "pname": "System.Globalization.Calendars", - "version": "4.3.0", - "sha256": "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq" - }, - { - "pname": "System.Globalization.Extensions", - "version": "4.3.0", - "sha256": "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls" - }, - { - "pname": "System.IO", - "version": "4.3.0", - "sha256": "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f" - }, - { - "pname": "System.IO.FileSystem", - "version": "4.3.0", - "sha256": "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw" - }, - { - "pname": "System.IO.FileSystem.Primitives", - "version": "4.3.0", - "sha256": "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c" - }, - { - "pname": "System.Linq", - "version": "4.3.0", - "sha256": "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7" - }, - { - "pname": "System.Memory", - "version": "4.5.3", - "sha256": "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a" - }, - { - "pname": "System.Memory", - "version": "4.5.4", - "sha256": "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y" - }, - { - "pname": "System.Net.Http", - "version": "4.3.4", - "sha256": "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl" - }, - { - "pname": "System.Net.Primitives", - "version": "4.3.0", - "sha256": "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii" - }, - { - "pname": "System.Private.Uri", - "version": "4.3.0", - "sha256": "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx" - }, - { - "pname": "System.Reflection", - "version": "4.3.0", - "sha256": "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m" - }, - { - "pname": "System.Reflection.Primitives", - "version": "4.3.0", - "sha256": "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276" - }, - { - "pname": "System.Resources.ResourceManager", - "version": "4.3.0", - "sha256": "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49" - }, - { - "pname": "System.Runtime", - "version": "4.3.0", - "sha256": "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7" - }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "6.0.0", - "sha256": "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc" - }, - { - "pname": "System.Runtime.Extensions", - "version": "4.3.0", - "sha256": "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60" - }, - { - "pname": "System.Runtime.Handles", - "version": "4.3.0", - "sha256": "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8" - }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.3.0", - "sha256": "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j" - }, - { - "pname": "System.Runtime.Loader", - "version": "4.3.0", - "sha256": "07fgipa93g1xxgf7193a6vw677mpzgr0z0cfswbvqqb364cva8dk" - }, - { - "pname": "System.Runtime.Numerics", - "version": "4.3.0", - "sha256": "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z" - }, - { - "pname": "System.Security.AccessControl", - "version": "5.0.0", - "sha256": "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r" - }, - { - "pname": "System.Security.Cryptography.Algorithms", - "version": "4.3.0", - "sha256": "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml" - }, - { - "pname": "System.Security.Cryptography.Cng", - "version": "4.3.0", - "sha256": "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv" - }, - { - "pname": "System.Security.Cryptography.Csp", - "version": "4.3.0", - "sha256": "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1" - }, - { - "pname": "System.Security.Cryptography.Encoding", - "version": "4.3.0", - "sha256": "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32" - }, - { - "pname": "System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "sha256": "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc" - }, - { - "pname": "System.Security.Cryptography.Primitives", - "version": "4.3.0", - "sha256": "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby" - }, - { - "pname": "System.Security.Cryptography.X509Certificates", - "version": "4.3.0", - "sha256": "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "5.0.0", - "sha256": "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8" - }, - { - "pname": "System.Text.Encoding", - "version": "4.3.0", - "sha256": "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr" - }, - { - "pname": "System.Text.Encoding.Extensions", - "version": "4.3.0", - "sha256": "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy" - }, - { - "pname": "System.Text.Encodings.Web", - "version": "6.0.0", - "sha256": "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai" - }, - { - "pname": "System.Text.Json", - "version": "6.0.0", - "sha256": "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl" - }, - { - "pname": "System.Threading", - "version": "4.3.0", - "sha256": "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34" - }, - { - "pname": "System.Threading.Channels", - "version": "6.0.0", - "sha256": "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj" - }, - { - "pname": "System.Threading.Tasks", - "version": "4.3.0", - "sha256": "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7" - }, - { - "pname": "System.ValueTuple", - "version": "4.5.0", - "sha256": "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy" - }, - { - "pname": "TagLibSharp", - "version": "2.2.0", - "sha256": "0jb0f84p4jd59ha36spyk9q08g6fjap3xywq32rcs2xwzhhqiq0y" - } -] From 0233a69802c4ce48f781fb1fe4596bef12118ddf Mon Sep 17 00:00:00 2001 From: mdarocha Date: Mon, 31 Mar 2025 07:39:09 +0200 Subject: [PATCH 009/115] openra: add updateScript A generic updateScript that can support any openra release paths --- pkgs/games/openra/build-engine.nix | 44 ++++++----- pkgs/games/openra/default.nix | 3 +- pkgs/games/openra/engines/release/default.nix | 2 +- pkgs/games/openra/updater.nix | 36 +++++++++ pkgs/games/openra/updater.sh | 75 +++++++++++++++++++ 5 files changed, 139 insertions(+), 21 deletions(-) create mode 100644 pkgs/games/openra/updater.nix create mode 100644 pkgs/games/openra/updater.sh diff --git a/pkgs/games/openra/build-engine.nix b/pkgs/games/openra/build-engine.nix index 95e12526790c..e9d68bd559f4 100644 --- a/pkgs/games/openra/build-engine.nix +++ b/pkgs/games/openra/build-engine.nix @@ -7,28 +7,34 @@ freetype, openal, lua51Packages, + openRaUpdater }: engine: -buildDotnetModule rec { +let pname = "openra-${engine.build}"; - inherit (engine) version; - - src = - if engine ? src then - engine.src - else - fetchFromGitHub { - owner = "OpenRA"; - repo = "OpenRA"; - rev = "${engine.build}-${engine.version}"; - sha256 = engine.sha256; - }; - - nugetDeps = engine.deps; - + version = engine.version; dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; dotnet-runtime = dotnetCorePackages.runtime_6_0-bin; +in +buildDotnetModule { + inherit pname version dotnet-sdk dotnet-runtime; + + src = fetchFromGitHub { + owner = "OpenRA"; + repo = "OpenRA"; + rev = "${engine.build}-${engine.version}"; + inherit (engine) hash; + }; + + passthru = { + updateScript = { + command = openRaUpdater engine; + supportedFeatures = [ "commit" ]; + }; + }; + + nugetDeps = engine.deps; useAppHost = false; @@ -84,11 +90,11 @@ buildDotnetModule rec { done ''; - meta = with lib; { + meta = { description = "Open Source real-time strategy game engine for early Westwood games such as Command & Conquer: Red Alert. ${engine.build} version"; homepage = "https://www.openra.net/"; - license = licenses.gpl3; - maintainers = with maintainers; [ mdarocha ]; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.mdarocha ]; platforms = [ "x86_64-linux" ]; mainProgram = "openra-ra"; }; diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index 19ea60b55c96..9a29a3f00e39 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -1,7 +1,8 @@ { callPackage }: let - buildOpenRAEngine = callPackage ./build-engine.nix { }; + openRaUpdater = callPackage ./updater.nix { }; + buildOpenRAEngine = callPackage ./build-engine.nix { inherit openRaUpdater; }; callPackage' = path: callPackage path { inherit buildOpenRAEngine; }; in { diff --git a/pkgs/games/openra/engines/release/default.nix b/pkgs/games/openra/engines/release/default.nix index a21a15fcc665..ed85b64d6391 100644 --- a/pkgs/games/openra/engines/release/default.nix +++ b/pkgs/games/openra/engines/release/default.nix @@ -3,6 +3,6 @@ buildOpenRAEngine { build = "release"; version = "20231010"; - sha256 = "sha256-klJkRoDLTcU7j2iwo4yT9CaKy8QXWDkYw7ApkopSDNM="; + hash = "sha256-klJkRoDLTcU7j2iwo4yT9CaKy8QXWDkYw7ApkopSDNM="; deps = ./deps.json; } diff --git a/pkgs/games/openra/updater.nix b/pkgs/games/openra/updater.nix new file mode 100644 index 000000000000..438e856b742b --- /dev/null +++ b/pkgs/games/openra/updater.nix @@ -0,0 +1,36 @@ +{ + lib, + writeShellApplication, + curl, + jq, + gnused, + nix, + nix-prefetch-github, + common-updater-scripts, +}: +engine: + +lib.getExe (writeShellApplication { + name = "openra-updater"; + runtimeInputs = [ + curl + jq + gnused + nix + nix-prefetch-github + common-updater-scripts + ]; + runtimeEnv = { + build = engine.build; + currentVersion = engine.version; + currentRev = lib.optionalString (lib.hasAttr "rev" engine) engine.rev; + }; + bashOptions = [ + "errexit" + "errtrace" + "nounset" + "pipefail" + ]; + + text = lib.readFile ./updater.sh; +}) diff --git a/pkgs/games/openra/updater.sh b/pkgs/games/openra/updater.sh new file mode 100644 index 000000000000..e353c254d10c --- /dev/null +++ b/pkgs/games/openra/updater.sh @@ -0,0 +1,75 @@ +if [[ -z "${UPDATE_NIX_ATTR_PATH:-}" ]]; then + echo "Missing UPDATE_NIX_ATTR_PATH - make sure you use mainters/scripts/update.nix to run this script!" 1>&2 + exit 1 +fi + +attrPath="$UPDATE_NIX_ATTR_PATH" + +nixFilePath="$(pwd)/pkgs/games/openra/engines/$build/default.nix" +if [[ ! -f "$nixFilePath" ]]; then + echo "$nixFilePath does not exist!" 1>&2 + exit 1 +fi + +depsFilePath="$(pwd)/pkgs/games/openra/engines/$build/deps.json" +if [[ ! -f "$depsFilePath" ]]; then + echo "$depsFilePath does not exist!" 1>&2 + exit 1 +fi + +# if on bleed, update to the latest commit from the bleed branch +# otherwise, check Github releases for releases with a matching prefix +declare newVersion +declare newHash +if [[ "$build" == "bleed" ]]; then + prefetchResult=$(nix-prefetch-github OpenRA OpenRA --json --rev "$build") + + newRev=$(echo "$prefetchResult" | jq -e -r '.rev') + if [[ "$currentRev" == "$newRev" ]]; then + echo "Already up to date!" 1>&2 + echo "[]" + exit 0 + fi + + # update rev + sed -i -E 's#(rev = ").*(";)#\1'"$newRev"'\2#' "$nixFilePath" + + # get new version based on commit date from github + newVersion=$(curl -s "https://api.github.com/repos/OpenRA/OpenRA/commits/$newRev" |\ + jq -r '.commit.committer.date' |\ + xargs -I{} date -d {} +%Y%m%d) + + newHash=$(echo "$prefetchResult" | jq -e -r '.hash') +else + newVersion=$(curl -s "https://api.github.com/repos/OpenRA/OpenRA/releases" |\ + jq -r --arg prefix "$build" \ + 'first(.[] | select(.tag_name | startswith($prefix)) | .tag_name) | split("-")[1]') + + if [[ "$currentVersion" == "$newVersion" ]]; then + echo "Already up to date!" 1>&2 + echo "[]" + exit 0 + fi + + newHash=$(nix-prefetch-github OpenRA OpenRA --json --rev "$build-$newVersion" | jq -r '.hash') +fi + +# update version +sed -i -E 's#(version = ").*(";)#\1'"$newVersion"'\2#' "$nixFilePath" + +# update hash +sed -i -E 's#(hash = ").*(";)#\1'"$newHash"'\2#' "$nixFilePath" + +# update deps.json by running the fetch-deps script +# shellcheck disable=SC2091 +$(nix-build -A "$attrPath".fetch-deps --no-out-link) 1>&2 + +# echo commit info, according to what maintainers/scripts/update.nix needs +cat <<-EOF +[{ + "attrPath": "$attrPath", + "oldVersion": "$currentVersion", + "newVersion": "$newVersion", + "files": ["$nixFilePath", "$depsFilePath"] +}] +EOF From 7996084a7a052ffe5d1e488759a5649a97ffcea4 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Mon, 31 Mar 2025 08:26:05 +0200 Subject: [PATCH 010/115] openraPackages.engines.bleed: init at 20250531 This is the bleeding-edge version, compiled straight from the `bleed` branch. --- pkgs/games/openra/build-engine.nix | 11 +- pkgs/games/openra/default.nix | 1 + pkgs/games/openra/engines/bleed/default.nix | 10 + pkgs/games/openra/engines/bleed/deps.json | 327 ++++++++++++++ pkgs/games/openra/engines/release/default.nix | 7 +- pkgs/games/openra/engines/release/deps.json | 409 +++--------------- 6 files changed, 414 insertions(+), 351 deletions(-) create mode 100644 pkgs/games/openra/engines/bleed/default.nix create mode 100644 pkgs/games/openra/engines/bleed/deps.json diff --git a/pkgs/games/openra/build-engine.nix b/pkgs/games/openra/build-engine.nix index e9d68bd559f4..a4dc0faf3aa1 100644 --- a/pkgs/games/openra/build-engine.nix +++ b/pkgs/games/openra/build-engine.nix @@ -7,23 +7,22 @@ freetype, openal, lua51Packages, - openRaUpdater + openRaUpdater, }: engine: let pname = "openra-${engine.build}"; version = engine.version; - dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; - dotnet-runtime = dotnetCorePackages.runtime_6_0-bin; + dotnet-sdk = engine.dotnet-sdk; in buildDotnetModule { - inherit pname version dotnet-sdk dotnet-runtime; + inherit pname version dotnet-sdk; src = fetchFromGitHub { owner = "OpenRA"; repo = "OpenRA"; - rev = "${engine.build}-${engine.version}"; + rev = if lib.hasAttr "rev" engine then engine.rev else "${engine.build}-${engine.version}"; inherit (engine) hash; }; @@ -86,7 +85,7 @@ buildDotnetModule { # Create Nix wrappers to the application scripts which setup the needed environment for bin in $(find $out/.bin-unwrapped -type f); do makeWrapper "$bin" "$out/bin/$(basename "$bin")" \ - --prefix "PATH" : "${lib.makeBinPath [ dotnet-runtime ]}" + --prefix "PATH" : "${lib.makeBinPath [ dotnet-sdk.runtime ]}" done ''; diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index 9a29a3f00e39..a164013d3b8c 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -8,5 +8,6 @@ in { engines = { release = callPackage' ./engines/release; + bleed = callPackage' ./engines/bleed; }; } diff --git a/pkgs/games/openra/engines/bleed/default.nix b/pkgs/games/openra/engines/bleed/default.nix new file mode 100644 index 000000000000..0c6e42ade287 --- /dev/null +++ b/pkgs/games/openra/engines/bleed/default.nix @@ -0,0 +1,10 @@ +{ buildOpenRAEngine, dotnetCorePackages }: + +buildOpenRAEngine { + build = "bleed"; + version = "20250531"; + rev = "9c8470d18e3d850583e64a5defc5d3492ba5055b"; + hash = "sha256-LQSHMmjwNAdnoq16MNjjXyvuFy9o87eXrsdRFqmoV24="; + deps = ./deps.json; + dotnet-sdk = dotnetCorePackages.sdk_8_0-bin; +} diff --git a/pkgs/games/openra/engines/bleed/deps.json b/pkgs/games/openra/engines/bleed/deps.json new file mode 100644 index 000000000000..06061c0bfcba --- /dev/null +++ b/pkgs/games/openra/engines/bleed/deps.json @@ -0,0 +1,327 @@ +[ + { + "pname": "DiscordRichPresence", + "version": "1.2.1.24", + "hash": "sha256-oRNrlF1/yK0QvrW2+48RsmSg9h9/pDIfA56/bpoHXFU=" + }, + { + "pname": "Linguini.Bundle", + "version": "0.8.1", + "hash": "sha256-SirB65XjhxBkS+OERZP1e+6l2xZl9DFLz2ST5k2x9tw=" + }, + { + "pname": "Linguini.Shared", + "version": "0.8.0", + "hash": "sha256-BnCgq61zLy6MMG6gNnZiIOjJNy/So1DPUsdR83m5ACM=" + }, + { + "pname": "Linguini.Syntax", + "version": "0.8.0", + "hash": "sha256-x5PIdYJVCvIJxsDRP0GZ1PUbAPJl6K4i+K/LNpNE1D0=" + }, + { + "pname": "Microsoft.CodeCoverage", + "version": "17.12.0", + "hash": "sha256-lGjifppD0OBMBp28pjUfPipaeXg739n8cPhtHWoo5RE=" + }, + { + "pname": "Microsoft.Extensions.DependencyModel", + "version": "9.0.0", + "hash": "sha256-xirwlMWM0hBqgTneQOGkZ8l45mHT08XuSSRIbprgq94=" + }, + { + "pname": "Microsoft.NET.Test.Sdk", + "version": "17.12.0", + "hash": "sha256-DKFEbhh2wPzahNeHdEoFig8tZh/LEVrFc5+zpT43Btg=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.0", + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "2.0.0", + "hash": "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.1.0", + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" + }, + { + "pname": "Microsoft.TestPlatform.ObjectModel", + "version": "17.12.0", + "hash": "sha256-3XBHBSuCxggAIlHXmKNQNlPqMqwFlM952Av6RrLw1/w=" + }, + { + "pname": "Microsoft.TestPlatform.TestHost", + "version": "17.12.0", + "hash": "sha256-rf8Sh0fQq44Sneuvs64unkkIHg8kOjDGWE35j9iLx5I=" + }, + { + "pname": "Microsoft.Win32.Registry", + "version": "4.5.0", + "hash": "sha256-WMBXsIb0DgPFPaFkNVxY9b9vcMxPqtgFgijKYMJfV/0=" + }, + { + "pname": "Mono.Nat", + "version": "3.0.4", + "hash": "sha256-NdOquU2NaKtCv0p1+eY6awjOBwwzf92CwAJ4Dgz2+4M=" + }, + { + "pname": "MP3Sharp", + "version": "1.0.5", + "hash": "sha256-26MNwfzzWqZaSXOicvu5gOpkeTx8N3IGK7K8I5oBBZI=" + }, + { + "pname": "Newtonsoft.Json", + "version": "13.0.1", + "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=" + }, + { + "pname": "NuGet.CommandLine", + "version": "6.12.2", + "hash": "sha256-cGqYcL06GolruYUIhgdxykVDRk8l4sFUmFsfQffwaJw=" + }, + { + "pname": "NUnit", + "version": "4.3.2", + "hash": "sha256-0RWe8uFoxYp6qhPlDDEghOMcKJgyw2ybvEoAqBLebeE=" + }, + { + "pname": "NUnit.Console", + "version": "3.19.0", + "hash": "sha256-o8EGtKH9GIRHwmNLXF2JfK1SSMS8l8EOPziHuLZESSg=" + }, + { + "pname": "NUnit.ConsoleRunner", + "version": "3.19.0", + "hash": "sha256-FR6lemDmbsZtWlpFIZnOT+EfFC4NZ88W+CI7zcl1APE=" + }, + { + "pname": "NUnit.Extension.NUnitProjectLoader", + "version": "3.8.0", + "hash": "sha256-T7I8wFXX3LeVisbfU0PB4LMQ4nauh4d31Jq1WJ9Qg9Y=" + }, + { + "pname": "NUnit.Extension.NUnitV2Driver", + "version": "3.9.0", + "hash": "sha256-4FIaCrUNbSNoFUk1eatv09jU7balbDXYPKosynqLAJQ=" + }, + { + "pname": "NUnit.Extension.NUnitV2ResultWriter", + "version": "3.8.0", + "hash": "sha256-PHNyAevJPdh2lDAfD7v1kVs+znnH251DbnfhvaJf5d8=" + }, + { + "pname": "NUnit.Extension.TeamCityEventListener", + "version": "1.0.7", + "hash": "sha256-+mzefd62LYpV4GnPFOUF2s6m1MJ5kr7nhG29UNwXfsI=" + }, + { + "pname": "NUnit.Extension.VSProjectLoader", + "version": "3.9.0", + "hash": "sha256-lgrzdXH8UqSsMyWKL1jbEzcEkBL2fXwkrGx+lQKG1V8=" + }, + { + "pname": "NUnit3TestAdapter", + "version": "4.6.0", + "hash": "sha256-9Yav2fYhC4w0OgsyUwU4/5rDy4FVDTpKnWHuwl/uKJQ=" + }, + { + "pname": "NVorbis", + "version": "0.10.5", + "hash": "sha256-1DKSHcK+KcBiqVyuJH4SlVybcJ/TR4I9Ad/WihbFOHo=" + }, + { + "pname": "OpenRA-Eluant", + "version": "1.0.22", + "hash": "sha256-V5AelmuyrPzLVWx0PguFUvKljBMy0X7WJ7HMs0/Jiow=" + }, + { + "pname": "OpenRA-Freetype6", + "version": "1.0.11", + "hash": "sha256-IUfupIBlP0gp3O+zQqXzTR26aGjMKOYdMVEKOdmtYb0=" + }, + { + "pname": "OpenRA-FuzzyLogicLibrary", + "version": "1.0.1", + "hash": "sha256-NW5e5ywU8XUtVezB4lHQPc4mAK1zb3wnpSvrkAhawE4=" + }, + { + "pname": "OpenRA-OpenAL-CS", + "version": "1.0.22", + "hash": "sha256-LeBJX8ImpZCgJMAXz14qjgcl65dRU+yKokQHXVXDfRU=" + }, + { + "pname": "OpenRA-SDL2-CS", + "version": "1.0.42", + "hash": "sha256-9O+Bg7EW+zDvgnebCz1qpoyXjnRjwrKDkonkOitez0E=" + }, + { + "pname": "Pfim", + "version": "0.11.3", + "hash": "sha256-SNngIsloTjRymY64AGw+agXeG4U3kIgE+Pk8NqxMBO8=" + }, + { + "pname": "rix0rrr.BeaconLib", + "version": "1.0.2", + "hash": "sha256-pJx8BQ9KTR8coXSubUvotmMM0YaczLMh3NJsdOGJHjg=" + }, + { + "pname": "Roslynator.Analyzers", + "version": "4.13.0", + "hash": "sha256-ogNCpTOysyxrhl8JmD5yX5ofu/F0t/qeVuxRgXk3+fI=" + }, + { + "pname": "Roslynator.Formatting.Analyzers", + "version": "4.13.0", + "hash": "sha256-tAPQYSjG8GX/4gLsLptpl1YFyWA4CkmpeXesvb1dDDo=" + }, + { + "pname": "runtime.any.System.IO", + "version": "4.3.0", + "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" + }, + { + "pname": "runtime.any.System.Reflection", + "version": "4.3.0", + "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" + }, + { + "pname": "runtime.any.System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" + }, + { + "pname": "runtime.any.System.Runtime", + "version": "4.3.0", + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" + }, + { + "pname": "runtime.any.System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" + }, + { + "pname": "runtime.any.System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" + }, + { + "pname": "runtime.native.System", + "version": "4.3.0", + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" + }, + { + "pname": "runtime.unix.System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" + }, + { + "pname": "SharpZipLib", + "version": "1.4.2", + "hash": "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY=" + }, + { + "pname": "StyleCop.Analyzers", + "version": "1.2.0-beta.556", + "hash": "sha256-97YYQcr5vZxTvi36608eUkA1wb6xllZQ7UcXbjrYIfU=" + }, + { + "pname": "StyleCop.Analyzers.Unstable", + "version": "1.2.0.556", + "hash": "sha256-aVop7a9r+X2RsZETgngBm3qQPEIiPBWgHzicGSTEymc=" + }, + { + "pname": "System.IO", + "version": "4.3.0", + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" + }, + { + "pname": "System.IO.Pipelines", + "version": "9.0.0", + "hash": "sha256-vb0NrPjfEao3kfZ0tavp2J/29XnsQTJgXv3/qaAwwz0=" + }, + { + "pname": "System.Memory", + "version": "4.5.3", + "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk=" + }, + { + "pname": "System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" + }, + { + "pname": "System.Reflection", + "version": "4.3.0", + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "1.6.0", + "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" + }, + { + "pname": "System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" + }, + { + "pname": "System.Runtime", + "version": "4.3.0", + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" + }, + { + "pname": "System.Runtime.Loader", + "version": "4.3.0", + "hash": "sha256-syG1GTFjYbwX146BD/L7t55j+DZqpHDc6z28kdSNzx0=" + }, + { + "pname": "System.Security.AccessControl", + "version": "4.5.0", + "hash": "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM=" + }, + { + "pname": "System.Security.Principal.Windows", + "version": "4.5.0", + "hash": "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY=" + }, + { + "pname": "System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" + }, + { + "pname": "System.Text.Encodings.Web", + "version": "9.0.0", + "hash": "sha256-WGaUklQEJywoGR2jtCEs5bxdvYu5SHaQchd6s4RE5x0=" + }, + { + "pname": "System.Text.Json", + "version": "9.0.0", + "hash": "sha256-aM5Dh4okLnDv940zmoFAzRmqZre83uQBtGOImJpoIqk=" + }, + { + "pname": "System.Threading.Channels", + "version": "9.0.0", + "hash": "sha256-depIorJqzjyWew0+aBRgbGh88KWivbp9RrtWZHFr+pI=" + }, + { + "pname": "System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" + }, + { + "pname": "System.ValueTuple", + "version": "4.5.0", + "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=" + }, + { + "pname": "TagLibSharp", + "version": "2.3.0", + "hash": "sha256-PD9bVZiPaeC8hNx2D+uDUf701cCaMi2IRi5oPTNN+/w=" + } +] diff --git a/pkgs/games/openra/engines/release/default.nix b/pkgs/games/openra/engines/release/default.nix index ed85b64d6391..5dfc9b0ad12c 100644 --- a/pkgs/games/openra/engines/release/default.nix +++ b/pkgs/games/openra/engines/release/default.nix @@ -1,8 +1,9 @@ -{ buildOpenRAEngine }: +{ buildOpenRAEngine, dotnetCorePackages }: buildOpenRAEngine { build = "release"; - version = "20231010"; - hash = "sha256-klJkRoDLTcU7j2iwo4yT9CaKy8QXWDkYw7ApkopSDNM="; + version = "20250330"; + hash = "sha256-chWkzn/NLZh2gOua9kE0ubRGjGCC0LvtZSWHBgXKqHw="; deps = ./deps.json; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; } diff --git a/pkgs/games/openra/engines/release/deps.json b/pkgs/games/openra/engines/release/deps.json index db95f86cdc7c..13e984edaf9c 100644 --- a/pkgs/games/openra/engines/release/deps.json +++ b/pkgs/games/openra/engines/release/deps.json @@ -1,542 +1,267 @@ [ { "pname": "DiscordRichPresence", - "version": "1.1.3.18", - "sha256": "0p4bhaggjjfd4gl06yiphqgncxgcq2bws4sjkrw0n2ldf3hgrps3" + "version": "1.2.1.24", + "hash": "sha256-oRNrlF1/yK0QvrW2+48RsmSg9h9/pDIfA56/bpoHXFU=" }, { "pname": "Linguini.Bundle", - "version": "0.5.0", - "sha256": "0515ifvvqhmhwdf7kw1wpamxn588hi150v6b8p4jfmr07y1dc4ml" + "version": "0.8.1", + "hash": "sha256-SirB65XjhxBkS+OERZP1e+6l2xZl9DFLz2ST5k2x9tw=" }, { "pname": "Linguini.Shared", - "version": "0.5.0", - "sha256": "1y45lf6ipa53469sdz110d16rxfyrkdr2xscgagwg07lr2833nbb" + "version": "0.8.0", + "hash": "sha256-BnCgq61zLy6MMG6gNnZiIOjJNy/So1DPUsdR83m5ACM=" }, { "pname": "Linguini.Syntax", - "version": "0.5.0", - "sha256": "06438fc5mizi702n8d7pqa21n5i7kwl1bwzxfy1l883j9gh64gjp" + "version": "0.8.0", + "hash": "sha256-x5PIdYJVCvIJxsDRP0GZ1PUbAPJl6K4i+K/LNpNE1D0=" }, { "pname": "Microsoft.Extensions.DependencyModel", - "version": "6.0.0", - "sha256": "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl" + "version": "6.0.2", + "hash": "sha256-WVM/gshGie1J9q5l3YWRzrPWYlVvX6ISI+SiVMoPp5o=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.0", - "sha256": "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm" - }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "1.1.1", - "sha256": "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj" + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" }, { "pname": "Microsoft.NETCore.Platforms", "version": "5.0.0", - "sha256": "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc" + "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=" }, { "pname": "Microsoft.NETCore.Targets", "version": "1.1.0", - "sha256": "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh" - }, - { - "pname": "Microsoft.Win32.Primitives", - "version": "4.3.0", - "sha256": "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq" + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" }, { "pname": "Microsoft.Win32.Registry", "version": "5.0.0", - "sha256": "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n" + "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=" }, { "pname": "Mono.Nat", "version": "3.0.4", - "sha256": "10zvyq60wy02q21dszrk1h3ww23b7bkgjxaapx1ans4d9nwsmlrm" + "hash": "sha256-NdOquU2NaKtCv0p1+eY6awjOBwwzf92CwAJ4Dgz2+4M=" }, { "pname": "MP3Sharp", "version": "1.0.5", - "sha256": "14h506d27g5j5c374dvw7iwn9sl0p7xp58kk95dacnpkzk0hv8yv" + "hash": "sha256-26MNwfzzWqZaSXOicvu5gOpkeTx8N3IGK7K8I5oBBZI=" }, { "pname": "Newtonsoft.Json", "version": "13.0.1", - "sha256": "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb" + "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=" }, { "pname": "NuGet.CommandLine", - "version": "4.4.1", - "sha256": "1szk5hbw22c1k5747dk95mzsy5vjw7qmvwv1wc9h080h9xzj9aab" + "version": "6.12.1", + "hash": "sha256-njbhGPbi3SwBNPdIZ6Zcb5OoeNRziN/UFbVwvO7jnvM=" }, { "pname": "NVorbis", "version": "0.10.5", - "sha256": "0yiqqlb8mmnz04yq4iykkxq9np4m29z29bjwm5ic0adyq8fr4cnl" + "hash": "sha256-1DKSHcK+KcBiqVyuJH4SlVybcJ/TR4I9Ad/WihbFOHo=" }, { "pname": "OpenRA-Eluant", "version": "1.0.22", - "sha256": "134ar57v7k5i4zb7xl9j2f6abwjjhl5kwx3cap5zrb5jdfb1x42p" + "hash": "sha256-V5AelmuyrPzLVWx0PguFUvKljBMy0X7WJ7HMs0/Jiow=" }, { "pname": "OpenRA-Freetype6", "version": "1.0.11", - "sha256": "1gb1mpckj2ji64fyca6cd1lbl7adyfjl5czgvhllhgv5h2jfwir1" + "hash": "sha256-IUfupIBlP0gp3O+zQqXzTR26aGjMKOYdMVEKOdmtYb0=" }, { "pname": "OpenRA-FuzzyLogicLibrary", "version": "1.0.1", - "sha256": "0kn0b8491srbllkpqvvkml02dkixs18y5hgcalnpbw8l5kkmwvim" + "hash": "sha256-NW5e5ywU8XUtVezB4lHQPc4mAK1zb3wnpSvrkAhawE4=" }, { "pname": "OpenRA-OpenAL-CS", "version": "1.0.22", - "sha256": "05bxqdams1s4la5fqlsijzmja1wf59gcy5y04jh91996q9glkq1d" + "hash": "sha256-LeBJX8ImpZCgJMAXz14qjgcl65dRU+yKokQHXVXDfRU=" }, { "pname": "OpenRA-SDL2-CS", - "version": "1.0.40", - "sha256": "0ysrryn63akysiv92mh0mra87pd8l8zvahp8pbxsliapdfq2n2qk" + "version": "1.0.42", + "hash": "sha256-9O+Bg7EW+zDvgnebCz1qpoyXjnRjwrKDkonkOitez0E=" }, { "pname": "Pfim", - "version": "0.11.2", - "sha256": "1mf91sfxa4c5xp5qmgyc85v84aprhgdy951f1f41xmygvmkk94mp" + "version": "0.11.3", + "hash": "sha256-SNngIsloTjRymY64AGw+agXeG4U3kIgE+Pk8NqxMBO8=" }, { "pname": "rix0rrr.BeaconLib", "version": "1.0.2", - "sha256": "0f0yi7hp8v6jvhhv7k4whv8hqqxnx15nvbkll4f1ykaa1w2pr754" + "hash": "sha256-pJx8BQ9KTR8coXSubUvotmMM0YaczLMh3NJsdOGJHjg=" }, { - "pname": "runtime.any.System.Collections", - "version": "4.3.0", - "sha256": "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0" + "pname": "Roslynator.Analyzers", + "version": "4.2.0", + "hash": "sha256-V2PIyTIM7qb8uJFBhfZ2R2+kbq8Cl9crBv/m+FBFFdk=" }, { - "pname": "runtime.any.System.Diagnostics.Tracing", - "version": "4.3.0", - "sha256": "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn" - }, - { - "pname": "runtime.any.System.Globalization", - "version": "4.3.0", - "sha256": "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x" - }, - { - "pname": "runtime.any.System.Globalization.Calendars", - "version": "4.3.0", - "sha256": "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201" + "pname": "Roslynator.Formatting.Analyzers", + "version": "4.2.0", + "hash": "sha256-fLY9WmWb3mJbmewiPaXqU5wim3IMew5A1t6ZPlMPEas=" }, { "pname": "runtime.any.System.IO", "version": "4.3.0", - "sha256": "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x" + "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" }, { "pname": "runtime.any.System.Reflection", "version": "4.3.0", - "sha256": "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly" + "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" }, { "pname": "runtime.any.System.Reflection.Primitives", "version": "4.3.0", - "sha256": "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf" - }, - { - "pname": "runtime.any.System.Resources.ResourceManager", - "version": "4.3.0", - "sha256": "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl" + "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" }, { "pname": "runtime.any.System.Runtime", "version": "4.3.0", - "sha256": "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b" - }, - { - "pname": "runtime.any.System.Runtime.Handles", - "version": "4.3.0", - "sha256": "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x" - }, - { - "pname": "runtime.any.System.Runtime.InteropServices", - "version": "4.3.0", - "sha256": "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19" + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" }, { "pname": "runtime.any.System.Text.Encoding", "version": "4.3.0", - "sha256": "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3" - }, - { - "pname": "runtime.any.System.Text.Encoding.Extensions", - "version": "4.3.0", - "sha256": "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8" + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" }, { "pname": "runtime.any.System.Threading.Tasks", "version": "4.3.0", - "sha256": "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va" - }, - { - "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "sha256": "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i" - }, - { - "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "sha256": "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r" - }, - { - "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "sha256": "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3" + "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" }, { "pname": "runtime.native.System", "version": "4.3.0", - "sha256": "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4" - }, - { - "pname": "runtime.native.System.Net.Http", - "version": "4.3.0", - "sha256": "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk" - }, - { - "pname": "runtime.native.System.Security.Cryptography.Apple", - "version": "4.3.0", - "sha256": "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q" - }, - { - "pname": "runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "sha256": "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6" - }, - { - "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "sha256": "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438" - }, - { - "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "sha256": "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj" - }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple", - "version": "4.3.0", - "sha256": "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi" - }, - { - "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "sha256": "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6" - }, - { - "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "sha256": "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1" - }, - { - "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "sha256": "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi" - }, - { - "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "sha256": "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w" - }, - { - "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl", - "version": "4.3.2", - "sha256": "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c" - }, - { - "pname": "runtime.unix.Microsoft.Win32.Primitives", - "version": "4.3.0", - "sha256": "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id" - }, - { - "pname": "runtime.unix.System.Diagnostics.Debug", - "version": "4.3.0", - "sha256": "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5" - }, - { - "pname": "runtime.unix.System.IO.FileSystem", - "version": "4.3.0", - "sha256": "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix" - }, - { - "pname": "runtime.unix.System.Net.Primitives", - "version": "4.3.0", - "sha256": "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4" + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" }, { "pname": "runtime.unix.System.Private.Uri", "version": "4.3.0", - "sha256": "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk" - }, - { - "pname": "runtime.unix.System.Runtime.Extensions", - "version": "4.3.0", - "sha256": "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p" + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" }, { "pname": "SharpZipLib", "version": "1.4.2", - "sha256": "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y" + "hash": "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY=" }, { "pname": "StyleCop.Analyzers", "version": "1.2.0-beta.435", - "sha256": "0dirz0av24ds2k7hgpss15y4wlhwlzz22qdjvkq0n3g3sxcckrsy" + "hash": "sha256-XufJWNfjDQvw3LJhIf6nHFJOfAla3wfPFLoRsRX4OTY=" }, { "pname": "StyleCop.Analyzers.Unstable", "version": "1.2.0.435", - "sha256": "1jv4ha4y2c9922n21yf2dvfkmi8qfa8z28gk5zsqdyck08izp9mh" - }, - { - "pname": "System.Buffers", - "version": "4.3.0", - "sha256": "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy" + "hash": "sha256-sKb7IwKT+Yb1L/Mh8ZFyGMU63W7C+SCsECkx4YmCZMs=" }, { "pname": "System.Buffers", "version": "4.5.1", - "sha256": "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3" - }, - { - "pname": "System.Collections", - "version": "4.3.0", - "sha256": "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9" - }, - { - "pname": "System.Collections.Concurrent", - "version": "4.3.0", - "sha256": "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8" - }, - { - "pname": "System.Diagnostics.Debug", - "version": "4.3.0", - "sha256": "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y" - }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "4.3.0", - "sha256": "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq" - }, - { - "pname": "System.Diagnostics.Tracing", - "version": "4.3.0", - "sha256": "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4" - }, - { - "pname": "System.Globalization", - "version": "4.3.0", - "sha256": "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki" - }, - { - "pname": "System.Globalization.Calendars", - "version": "4.3.0", - "sha256": "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq" - }, - { - "pname": "System.Globalization.Extensions", - "version": "4.3.0", - "sha256": "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls" + "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" }, { "pname": "System.IO", "version": "4.3.0", - "sha256": "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f" - }, - { - "pname": "System.IO.FileSystem", - "version": "4.3.0", - "sha256": "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw" - }, - { - "pname": "System.IO.FileSystem.Primitives", - "version": "4.3.0", - "sha256": "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c" - }, - { - "pname": "System.Linq", - "version": "4.3.0", - "sha256": "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7" + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" }, { "pname": "System.Memory", "version": "4.5.3", - "sha256": "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a" + "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk=" }, { "pname": "System.Memory", "version": "4.5.4", - "sha256": "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y" - }, - { - "pname": "System.Net.Http", - "version": "4.3.4", - "sha256": "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl" - }, - { - "pname": "System.Net.Primitives", - "version": "4.3.0", - "sha256": "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii" + "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E=" }, { "pname": "System.Private.Uri", "version": "4.3.0", - "sha256": "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx" + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" }, { "pname": "System.Reflection", "version": "4.3.0", - "sha256": "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m" + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" }, { "pname": "System.Reflection.Primitives", "version": "4.3.0", - "sha256": "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276" - }, - { - "pname": "System.Resources.ResourceManager", - "version": "4.3.0", - "sha256": "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49" + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" }, { "pname": "System.Runtime", "version": "4.3.0", - "sha256": "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7" + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" }, { "pname": "System.Runtime.CompilerServices.Unsafe", "version": "6.0.0", - "sha256": "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc" - }, - { - "pname": "System.Runtime.Extensions", - "version": "4.3.0", - "sha256": "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60" - }, - { - "pname": "System.Runtime.Handles", - "version": "4.3.0", - "sha256": "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8" - }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.3.0", - "sha256": "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j" + "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" }, { "pname": "System.Runtime.Loader", "version": "4.3.0", - "sha256": "07fgipa93g1xxgf7193a6vw677mpzgr0z0cfswbvqqb364cva8dk" - }, - { - "pname": "System.Runtime.Numerics", - "version": "4.3.0", - "sha256": "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z" + "hash": "sha256-syG1GTFjYbwX146BD/L7t55j+DZqpHDc6z28kdSNzx0=" }, { "pname": "System.Security.AccessControl", "version": "5.0.0", - "sha256": "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r" - }, - { - "pname": "System.Security.Cryptography.Algorithms", - "version": "4.3.0", - "sha256": "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml" - }, - { - "pname": "System.Security.Cryptography.Cng", - "version": "4.3.0", - "sha256": "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv" - }, - { - "pname": "System.Security.Cryptography.Csp", - "version": "4.3.0", - "sha256": "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1" - }, - { - "pname": "System.Security.Cryptography.Encoding", - "version": "4.3.0", - "sha256": "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32" - }, - { - "pname": "System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "sha256": "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc" - }, - { - "pname": "System.Security.Cryptography.Primitives", - "version": "4.3.0", - "sha256": "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby" - }, - { - "pname": "System.Security.Cryptography.X509Certificates", - "version": "4.3.0", - "sha256": "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h" + "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" }, { "pname": "System.Security.Principal.Windows", "version": "5.0.0", - "sha256": "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8" + "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" }, { "pname": "System.Text.Encoding", "version": "4.3.0", - "sha256": "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr" - }, - { - "pname": "System.Text.Encoding.Extensions", - "version": "4.3.0", - "sha256": "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy" + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" }, { "pname": "System.Text.Encodings.Web", - "version": "6.0.0", - "sha256": "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai" + "version": "6.0.1", + "hash": "sha256-l3oKwZStjew/ClSrDaVLyHDAExoP6Iwm6uqJSdI9YJo=" }, { "pname": "System.Text.Json", - "version": "6.0.0", - "sha256": "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl" - }, - { - "pname": "System.Threading", - "version": "4.3.0", - "sha256": "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34" + "version": "6.0.11", + "hash": "sha256-KsgOU3RvSN/Kc+my45K0eua4owQPZar81LVF2Kzupf0=" }, { "pname": "System.Threading.Channels", "version": "6.0.0", - "sha256": "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj" + "hash": "sha256-klGYnsyrjvXaGeqgfnMf/dTAMNtcHY+zM4Xh6v2JfuE=" }, { "pname": "System.Threading.Tasks", "version": "4.3.0", - "sha256": "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7" + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" }, { "pname": "System.ValueTuple", "version": "4.5.0", - "sha256": "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy" + "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI=" }, { "pname": "TagLibSharp", "version": "2.3.0", - "sha256": "1z7v9lrkss1f8s42sclsq3az9zjihgmhyxnwhjyf0scgk1amngrw" + "hash": "sha256-PD9bVZiPaeC8hNx2D+uDUf701cCaMi2IRi5oPTNN+/w=" } ] From e1b7bd330ec2f0340fdb8406a9ed8e7ae7273105 Mon Sep 17 00:00:00 2001 From: qbisi Date: Fri, 23 May 2025 07:36:53 +0800 Subject: [PATCH 011/115] gdcm: 3.0.24 -> 3.0.25 --- ...slylosslessarray-in-TestTransferSyntax.patch | 14 ++++++++++++++ pkgs/development/libraries/gdcm/default.nix | 17 +++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/gdcm/add-missing-losslylosslessarray-in-TestTransferSyntax.patch diff --git a/pkgs/development/libraries/gdcm/add-missing-losslylosslessarray-in-TestTransferSyntax.patch b/pkgs/development/libraries/gdcm/add-missing-losslylosslessarray-in-TestTransferSyntax.patch new file mode 100644 index 000000000000..a3701135c510 --- /dev/null +++ b/pkgs/development/libraries/gdcm/add-missing-losslylosslessarray-in-TestTransferSyntax.patch @@ -0,0 +1,14 @@ +diff --git a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestTransferSyntax.cxx b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestTransferSyntax.cxx +index 7ad350d..6f962ce 100644 +--- a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestTransferSyntax.cxx ++++ b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestTransferSyntax.cxx +@@ -43,6 +43,9 @@ static const int losslylosslessarray[][3] = { + { 1, 0, 1 }, // MPEG2MainProfileHighLevel + { 1, 0, 1 }, // MPEG4AVCH264HighProfileLevel4_1 + { 1, 0, 1 }, // MPEG4AVCH264BDcompatibleHighProfileLevel4_1 ++ { 0, 1, 1 }, // HTJ2KLossless ++ { 0, 1, 1 }, // HTJ2KRPCLLossless ++ { 1, 0, 1 }, // HTJ2K + }; + + static int TestTransferSyntaxAll() diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 765e88adbfef..ea86f6155bc7 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, cmake, enableVTK ? true, vtk, @@ -18,15 +19,27 @@ stdenv.mkDerivation rec { pname = if enablePython then "python-gdcm" else "gdcm"; - version = "3.0.24"; + version = "3.0.25"; src = fetchFromGitHub { owner = "malaterre"; repo = "GDCM"; tag = "v${version}"; - hash = "sha256-Zlb6UCP4aFZOJJNhFQBBrwzst+f37gs1zaCBMTOUgZE="; + hash = "sha256-PYVVlSqeAZCWvnWPqqWGQIWatMfPYqnrXc7cqi8UseU="; }; + patches = + [ + ./add-missing-losslylosslessarray-in-TestTransferSyntax.patch + ] + ++ lib.optionals (lib.versionOlder vtk.version "9.3") [ + (fetchpatch2 { + url = "https://github.com/malaterre/GDCM/commit/3be6c2fa0945c91889bcf06e8c20e88f69692dd5.patch?full_index=1"; + hash = "sha256-Yt5f4mxhP5n+L0A/CRq3CxKCqUT7LZ8uKdbCf9P71Zc="; + revert = true; + }) + ]; + cmakeFlags = [ "-DGDCM_BUILD_APPLICATIONS=ON" From 6cffba31f094136e82d6923a50eb846134ec7562 Mon Sep 17 00:00:00 2001 From: qbisi Date: Sat, 24 May 2025 01:22:32 +0800 Subject: [PATCH 012/115] gdcm: use ctestCheckHook --- pkgs/development/libraries/gdcm/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index ea86f6155bc7..e034c3a52c2d 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -15,6 +15,7 @@ openjpeg, zlib, pkg-config, + ctestCheckHook, }: stdenv.mkDerivation rec { @@ -108,11 +109,10 @@ stdenv.mkDerivation rec { "TestRescaler2" ]; - checkPhase = '' - runHook preCheck - ctest --exclude-regex '^(${lib.concatStringsSep "|" disabledTests})$' - runHook postCheck - ''; + nativeCheckInputs = [ + ctestCheckHook + ]; + doCheck = true; # note that when the test data is available to the build via `fetchSubmodules = true`, # a number of additional but much slower tests are enabled From 93ee7a92325523726ef49c02aaf6bbebfe67dcd7 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 2 Jun 2025 16:33:09 +0200 Subject: [PATCH 013/115] python3Packages.huggingface-hub: 0.31.4 -> 0.32.3 Diff: https://github.com/huggingface/huggingface_hub/compare/refs/tags/v0.31.4...refs/tags/v0.32.3 Changelog: https://github.com/huggingface/huggingface_hub/releases/tag/v0.32.3 --- .../python-modules/huggingface-hub/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index a97b354d2a32..c97eaa88af24 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -9,6 +9,7 @@ # dependencies filelock, fsspec, + hf-xet, packaging, pyyaml, requests, @@ -25,8 +26,6 @@ safetensors, # hf_transfer hf-transfer, - # hf_xet - hf-xet, # fastai toml, fastai, @@ -41,14 +40,14 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.31.4"; + version = "0.32.3"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "huggingface_hub"; tag = "v${version}"; - hash = "sha256-V/FbInskBHefbPkbwQyx+aWBcdrk5WaXXbR/v3fNU+Y="; + hash = "sha256-qCFwzhjQI1L7mgSSqDPw59woTSTDY0boWSHcm7dgx2A="; }; build-system = [ setuptools ]; @@ -56,6 +55,7 @@ buildPythonPackage rec { dependencies = [ filelock fsspec + hf-xet packaging pyyaml requests From a4eb33fcb643b009836ab69053c20ee9b9fbf4c0 Mon Sep 17 00:00:00 2001 From: Louis Dalibard Date: Tue, 3 Jun 2025 22:08:36 +0200 Subject: [PATCH 014/115] maintainers: add ontake to maintainers --- maintainers/maintainer-list.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a904bdda324d..b9b946d094d2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18521,6 +18521,14 @@ githubId = 107261; name = "Andrey Kuznetsov"; }; + ontake = { + name = "Louis Dalibard"; + email = "ontake@ontake.dev"; + github = "make-42"; + githubId = 17462236; + matrix = "@ontake:matrix.ontake.dev"; + keys = [ { fingerprint = "36BC 916D DD4E B1EE EE82 4BBF DC95 900F 6DA7 9992"; } ]; + }; onthestairs = { email = "austinplatt@gmail.com"; github = "onthestairs"; From 769b0839352fd1593f7648158e670d2e09b6812c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 3 Jun 2025 16:02:51 -0700 Subject: [PATCH 015/115] python3Packages.structlog: 25.3.0 -> 25.4.0 Diff: https://github.com/hynek/structlog/compare/refs/tags/25.3.0...refs/tags/25.4.0 Changelog: https://github.com/hynek/structlog/blob/25.4.0/CHANGELOG.md --- pkgs/development/python-modules/structlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index 0750096fec06..d7df69bc30a1 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "structlog"; - version = "25.3.0"; + version = "25.4.0"; pyproject = true; src = fetchFromGitHub { owner = "hynek"; repo = "structlog"; tag = version; - hash = "sha256-Ve6RBCQ8PJtlN/gzSjj/gxFkJsgcJhlNMAKDybBTx54="; + hash = "sha256-iNnUogcICQJvHBZO2J8uk4NleQY/ra3ZzxQgnSRKr30="; }; build-system = [ From 4cd620aa48849887401fe0cebb935e5bf23cd6a9 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 4 Jun 2025 04:47:42 +0200 Subject: [PATCH 016/115] python3Packages.ffmpy: 0.5.0 -> 0.6.0 Diff: https://github.com/Ch00k/ffmpy/compare/refs/tags/0.5.0...refs/tags/0.6.0 --- pkgs/development/python-modules/ffmpy/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/ffmpy/default.nix b/pkgs/development/python-modules/ffmpy/default.nix index 4d34d64595c3..0ce5cdfc5b99 100644 --- a/pkgs/development/python-modules/ffmpy/default.nix +++ b/pkgs/development/python-modules/ffmpy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, fetchFromGitHub, pythonOlder, - poetry-core, + uv-build, pytestCheckHook, go, ffmpeg-headless, @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "ffmpy"; - version = "0.5.0"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.8.1"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Ch00k"; repo = "ffmpy"; tag = version; - hash = "sha256-spbyz1EyMJRXJTm7TqN9XoqR9ztBKsNZx3NURwV7N2w="; + hash = "sha256-U20mBg+428kkka6NY9qc7X8jH8A5bKa++g2+PTn/MYg="; }; postPatch = '' @@ -33,13 +33,13 @@ buildPythonPackage rec { # The tests test a mock that does not behave like ffmpeg. If we default to the nix-store ffmpeg they fail. for fname in tests/*.py; do - echo 'FFmpeg.__init__.__defaults__ = ("ffmpeg", *FFmpeg.__init__.__defaults__[1:])' >>"$fname" + echo >>"$fname" 'FFmpeg.__init__.__defaults__ = ("ffmpeg", *FFmpeg.__init__.__defaults__[1:])' done ''; pythonImportsCheck = [ "ffmpy" ]; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ uv-build ]; nativeCheckInputs = [ pytestCheckHook From 49eb7acec61473938701ce3570ab146bf72e8ca5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 25 May 2025 15:03:13 -0700 Subject: [PATCH 017/115] python3Packages.cython_3_1: init at 3.1.1 --- pkgs/top-level/python-packages.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3757307b0e8f..ab4be8fa3678 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3142,6 +3142,16 @@ self: super: with self; { cython_0 = callPackage ../development/python-modules/cython/0.nix { }; + cython_3_1 = cython.overridePythonAttrs rec { + version = "3.1.1"; + src = pkgs.fetchFromGitHub { + owner = "cython"; + repo = "cython"; + tag = version; + hash = "sha256-KdRYPH3Do3KntgqLGIUSeD6DjmXNdFjI2ZSszzMjF6k="; + }; + }; + cytoolz = callPackage ../development/python-modules/cytoolz { }; dacite = callPackage ../development/python-modules/dacite { }; From ef049c91110bd0d1c4ae4e965d3e928978e8d1c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Jun 2025 08:57:17 +0000 Subject: [PATCH 018/115] python3Packages.nagiosplugin: 1.3.3 -> 1.4.0 --- pkgs/development/python-modules/nagiosplugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nagiosplugin/default.nix b/pkgs/development/python-modules/nagiosplugin/default.nix index 4ba887fb71d7..ca165cf02109 100644 --- a/pkgs/development/python-modules/nagiosplugin/default.nix +++ b/pkgs/development/python-modules/nagiosplugin/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "nagiosplugin"; - version = "1.3.3"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vOr67DWfAyOT3dVgrizI0WNhODPsY8k85xifhZBOU9Y="; + hash = "sha256-IxabBKI8StRBnvm3Zm1AH0jfMkez38P4dL4sFP0ttAE="; }; nativeBuildInputs = [ twine ]; From a37ab7eed9658242a435b263bb8b2b6c43e8719d Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Sat, 29 Mar 2025 20:40:09 +0900 Subject: [PATCH 019/115] tree-sitter-grammars.tree-sitter-crystal: init Signed-off-by: Ludovico Piero --- .../tools/parsing/tree-sitter/grammars/default.nix | 1 + .../tree-sitter/grammars/tree-sitter-crystal.json | 12 ++++++++++++ .../development/tools/parsing/tree-sitter/update.nix | 4 ++++ 3 files changed, 17 insertions(+) create mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-crystal.json diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 8b605c3c9478..b8ad14bda344 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -12,6 +12,7 @@ tree-sitter-comment = lib.importJSON ./tree-sitter-comment.json; tree-sitter-commonlisp = lib.importJSON ./tree-sitter-commonlisp.json; tree-sitter-cpp = lib.importJSON ./tree-sitter-cpp.json; + tree-sitter-crystal = lib.importJSON ./tree-sitter-crystal.json; tree-sitter-css = lib.importJSON ./tree-sitter-css.json; tree-sitter-cuda = lib.importJSON ./tree-sitter-cuda.json; tree-sitter-cue = lib.importJSON ./tree-sitter-cue.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-crystal.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-crystal.json new file mode 100644 index 000000000000..eb5e7cb50ed3 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-crystal.json @@ -0,0 +1,12 @@ +{ + "url": "https://github.com/crystal-lang-tools/tree-sitter-crystal", + "rev": "cf69a6504a82fecc55ee1680983744a94a9edfaa", + "date": "2025-03-28T11:48:18-04:00", + "path": "/nix/store/c20hqk12him4k0675y3l5f53lfnaa37d-tree-sitter-crystal", + "sha256": "0jzmkjfhrz1f5pw274dj0f7avazsyhx0h6vbg4p5xxzkqch19wah", + "hash": "sha256-UPEUIMPz914ueWsbCDr0+qutjgOykSP4LS78DJ2c9Us=", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index c4e35962db3b..ac8b80ccaef7 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -488,6 +488,10 @@ let orga = "norgate-av"; repo = "tree-sitter-netlinx"; }; + "tree-sitter-crystal" = { + orga = "crystal-lang-tools"; + repo = "tree-sitter-crystal"; + }; }; allGrammars = From 565ec0528aec1fd4bb620e9cae1dccee85a1f595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 4 Jun 2025 18:33:31 -0700 Subject: [PATCH 020/115] python3Packages.pyprobeplus: init at 1.0.1 --- .../python-modules/pyprobeplus/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/pyprobeplus/default.nix diff --git a/pkgs/development/python-modules/pyprobeplus/default.nix b/pkgs/development/python-modules/pyprobeplus/default.nix new file mode 100644 index 000000000000..2f1be9b8f442 --- /dev/null +++ b/pkgs/development/python-modules/pyprobeplus/default.nix @@ -0,0 +1,39 @@ +{ + bleak, + buildPythonPackage, + fetchFromGitHub, + lib, + setuptools, +}: + +buildPythonPackage rec { + pname = "pyprobeplus"; + version = "1.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pantherale0"; + repo = "pyprobeplus"; + tag = version; + hash = "sha256-ixrkwnvqjHwqnKG3Xo4qJP/FcP7fuAOPKpar13e8U1w="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + bleak + ]; + + pythonImportsCheck = [ "pyprobeplus" ]; + + # upstream has no tests + doCheck = false; + + meta = { + changelog = "https://github.com/pantherale0/pyprobeplus/releases/tag/${src.tag}"; + description = "Generic library to interact with a Probe Plus BLE device"; + homepage = "https://github.com/pantherale0/pyprobeplus"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index faf0040093ef..863d4c7cb13e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13231,6 +13231,8 @@ self: super: with self; { pyprobables = callPackage ../development/python-modules/pyprobables { }; + pyprobeplus = callPackage ../development/python-modules/pyprobeplus { }; + pyprof2calltree = callPackage ../development/python-modules/pyprof2calltree { }; pyproj = callPackage ../development/python-modules/pyproj { }; From 02b6183c5abd60643314ec8877187149785eac3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 4 Jun 2025 18:51:30 -0700 Subject: [PATCH 021/115] python3Packages.zcc-helper: init at 3.5.2 --- .../python-modules/zcc-helper/default.nix | 42 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/python-modules/zcc-helper/default.nix diff --git a/pkgs/development/python-modules/zcc-helper/default.nix b/pkgs/development/python-modules/zcc-helper/default.nix new file mode 100644 index 000000000000..a53b5f032f71 --- /dev/null +++ b/pkgs/development/python-modules/zcc-helper/default.nix @@ -0,0 +1,42 @@ +{ + buildPythonPackage, + fetchFromBitbucket, + lib, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "zcc-helper"; + version = "3.5.2"; + pyproject = true; + + src = fetchFromBitbucket { + owner = "mark_hannon"; + repo = "zcc"; + rev = "release_${version}"; + hash = "sha256-6cpLpzzJPoyWaldXZzptV2LY5aYmRtVf0rd1Ye71VG0="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "zcc" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # tests require running a server + "tests/test_controller.py" + # fixture 'when' not found + "tests/test_socket.py" + ]; + + meta = { + description = "ZIMI ZCC helper module"; + homepage = "https://bitbucket.org/mark_hannon/zcc"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index faf0040093ef..05fe3e7ac3ca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19556,6 +19556,8 @@ self: super: with self; { zcbor = callPackage ../development/python-modules/zcbor { }; + zcc-helper = callPackage ../development/python-modules/zcc-helper { }; + zconfig = callPackage ../development/python-modules/zconfig { }; zdaemon = callPackage ../development/python-modules/zdaemon { }; From 32ddfbc9e7f3b7344ba722ca57f107bd4a4c17ff Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Thu, 5 Jun 2025 09:35:27 +0200 Subject: [PATCH 022/115] tp_smapi: remove update script --- pkgs/os-specific/linux/tp_smapi/default.nix | 20 --------------- pkgs/os-specific/linux/tp_smapi/update.nix | 28 --------------------- 2 files changed, 48 deletions(-) delete mode 100644 pkgs/os-specific/linux/tp_smapi/update.nix diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix index 0c80a69f4888..90cdbeafca6a 100644 --- a/pkgs/os-specific/linux/tp_smapi/default.nix +++ b/pkgs/os-specific/linux/tp_smapi/default.nix @@ -4,13 +4,6 @@ fetchFromGitHub, fetchpatch, kernel, - writeScript, - coreutils, - gnugrep, - jq, - curl, - common-updater-scripts, - runtimeShell, }: stdenv.mkDerivation rec { @@ -53,19 +46,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = import ./update.nix { - inherit - lib - writeScript - coreutils - gnugrep - jq - curl - common-updater-scripts - runtimeShell - ; - }; - meta = { description = "IBM ThinkPad hardware functions driver"; homepage = "https://github.com/linux-thinkpad/tp_smapi"; diff --git a/pkgs/os-specific/linux/tp_smapi/update.nix b/pkgs/os-specific/linux/tp_smapi/update.nix deleted file mode 100644 index 8b6fde3c0eaa..000000000000 --- a/pkgs/os-specific/linux/tp_smapi/update.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - writeScript, - coreutils, - curl, - gnugrep, - jq, - common-updater-scripts, - runtimeShell, -}: - -writeScript "update-tp_smapi" '' - #!${runtimeShell} - PATH=${ - lib.makeBinPath [ - common-updater-scripts - coreutils - curl - gnugrep - jq - ] - } - - tags=`curl -s https://api.github.com/repos/evgeni/tp_smapi/tags` - latest_tag=`echo $tags | jq -r '.[] | .name' | grep -oP "^tp-smapi/\K.*" | sort --version-sort | tail -1` - - update-source-version linuxPackages.tp_smapi "$latest_tag" -'' From 3e454d9affa7decc061c154e9837b77b6ca846e2 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Thu, 5 Jun 2025 09:35:02 +0200 Subject: [PATCH 023/115] tp_smapi: 0.43 -> 0.44-unstable-2025-05-26 --- pkgs/os-specific/linux/tp_smapi/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix index 90cdbeafca6a..0e27fb45b547 100644 --- a/pkgs/os-specific/linux/tp_smapi/default.nix +++ b/pkgs/os-specific/linux/tp_smapi/default.nix @@ -2,30 +2,20 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, kernel, }: stdenv.mkDerivation rec { name = "tp_smapi-${version}-${kernel.version}"; - version = "0.43"; + version = "0.44-unstable-2025-05-26"; src = fetchFromGitHub { owner = "linux-thinkpad"; repo = "tp_smapi"; - rev = "tp-smapi/${version}"; - sha256 = "1rjb0njckczc2mj05cagvj0lkyvmyk6bw7wkiinv81lw8m90g77g"; + rev = "a6122c0840c36bf232250afd1da30aaedaf24910"; + hash = "sha256-4bVyhTVj29ni9hduN20+VEl5/N0BAoMNMBw+k4yl8Y0="; }; - patches = [ - # update DEFINE_SEMAPHORE usage for linux 6.4+ - # https://github.com/linux-thinkpad/tp_smapi/pull/45 - (fetchpatch { - url = "https://github.com/linux-thinkpad/tp_smapi/commit/0c3398b1acf2a2cabd9cee91dc3fe3d35805fa8b.patch"; - hash = "sha256-J/WvijrpHGwFOZMMxnHdNin5eh8vViTcNb4nwsCqsLs="; - }) - ]; - nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; From dddbb686bc261c49d2d1206fff80dcb7155337c5 Mon Sep 17 00:00:00 2001 From: misilelab Date: Fri, 6 Jun 2025 18:12:48 +0900 Subject: [PATCH 024/115] netavark: 1.15.1 -> 1.15.2 https://github.com/containers/netavark/releases/tag/v1.15.2 Signed-off-by: misilelab --- pkgs/by-name/ne/netavark/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/netavark/package.nix b/pkgs/by-name/ne/netavark/package.nix index 2c5ad1b57736..64d3c76d8af2 100644 --- a/pkgs/by-name/ne/netavark/package.nix +++ b/pkgs/by-name/ne/netavark/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "netavark"; - version = "1.15.1"; + version = "1.15.2"; src = fetchFromGitHub { owner = "containers"; repo = "netavark"; rev = "v${version}"; - hash = "sha256-/X0G26XuIBVLnXVADws+CGWwDA8IwTs/XEbA0slaazs="; + hash = "sha256-sZzbhlrjTuMwOm0+vBMSqHbpqLGhz6jExpBSokqj/VE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-orhYOBZDfrbXJ+nNBu2nsiTUbpKuGWmfuryCzyXSjG0="; + cargoHash = "sha256-ZIFD76GLe44Hx7+/YgBeixsZ+KuYDHBCzMC91R+uTNw="; nativeBuildInputs = [ installShellFiles From 8866fe71706b69f4fc7d669043df11a3f73c8613 Mon Sep 17 00:00:00 2001 From: misilelab Date: Fri, 6 Jun 2025 18:23:55 +0900 Subject: [PATCH 025/115] pdm: 2.24.1 -> 2.24.2 https://github.com/pdm-project/pdm/releases/tag/2.24.2 Signed-off-by: misilelab --- pkgs/by-name/pd/pdm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix index 0eeb269bb258..5a9094aebe71 100644 --- a/pkgs/by-name/pd/pdm/package.nix +++ b/pkgs/by-name/pd/pdm/package.nix @@ -24,7 +24,7 @@ let in python.pkgs.buildPythonApplication rec { pname = "pdm"; - version = "2.24.1"; + version = "2.24.2"; pyproject = true; disabled = python.pkgs.pythonOlder "3.8"; @@ -33,7 +33,7 @@ python.pkgs.buildPythonApplication rec { owner = "pdm-project"; repo = "pdm"; tag = version; - hash = "sha256-YChgPJmHWJ4tftosa24SKB0J7uV/zR6VWX18poEEsLY="; + hash = "sha256-z2p7guCQrKpDSYRHaGcHuwoTDsprrvJo9SH3sGBILSQ="; }; pythonRelaxDeps = [ "hishel" ]; From ff6a188dc5a71c7db716e26e71bf14914af478f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jun 2025 09:40:25 +0000 Subject: [PATCH 026/115] htmlhint: 1.2.0 -> 1.5.0 --- pkgs/by-name/ht/htmlhint/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ht/htmlhint/package.nix b/pkgs/by-name/ht/htmlhint/package.nix index f4052cc7e082..8f5b70a0dd18 100644 --- a/pkgs/by-name/ht/htmlhint/package.nix +++ b/pkgs/by-name/ht/htmlhint/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "htmlhint"; - version = "1.2.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "htmlhint"; repo = "HTMLHint"; rev = "v${version}"; - hash = "sha256-kn1HwOHJq4B+R/YIFQvvvG4efA7iVUVWLV8vfzbNEpA="; + hash = "sha256-h40diAM96jQRXIaPqDoQCoB4guMJCMIr9MxbpB7bb8A="; }; - npmDepsHash = "sha256-8YeaMU/maXN8Vvy5BYqge4Ky5/Ln4GJ7stVe3y+8uU4="; + npmDepsHash = "sha256-VCeMyreQb9DjX1Leyt0vvoejdgG11Rhs3PAFsieeSCs="; meta = { changelog = "https://github.com/htmlhint/HTMLHint/blob/${src.rev}/CHANGELOG.md"; From 30f3c1761615e0755725d8f164b6d39693d6ca79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jun 2025 10:44:49 +0000 Subject: [PATCH 027/115] python3Packages.pyinstaller: 6.13.0 -> 6.14.0 --- pkgs/development/python-modules/pyinstaller/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyinstaller/default.nix b/pkgs/development/python-modules/pyinstaller/default.nix index 7202152b21b9..51d6b07269ed 100644 --- a/pkgs/development/python-modules/pyinstaller/default.nix +++ b/pkgs/development/python-modules/pyinstaller/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "pyinstaller"; - version = "6.13.0"; + version = "6.14.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-OJEf7sLF4hXlFZp+Zv2xJAAWi9EWFDtUqKejfwhzNFY="; + hash = "sha256-zFXNwhSRci10Ez41qzY6iGebN+4tdvnYCty8Cuhi1jA="; }; build-system = [ setuptools ]; From 192e86b204017d58aa8d35484d1ccaf4613af147 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jun 2025 11:00:47 +0000 Subject: [PATCH 028/115] radarr: 5.24.1.10017 -> 5.25.0.10024 --- pkgs/servers/radarr/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 82dd1814f06b..56e695c92def 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -27,17 +27,17 @@ let hash = { - x64-linux_hash = "sha256-cXAOXQE6eBFgJMw/Tai1/bxWon1fuh7guYUdQ+pmIMA="; - arm64-linux_hash = "sha256-ogWUNXtgmoUOxhQNE15+stddyurCPCeCb+OdHEdCZE4="; - x64-osx_hash = "sha256-+0UevL2jgkv0lLcRP7qJO3HrYfgNCWEPcwlGlSRPWA8="; - arm64-osx_hash = "sha256-nhUno+3a76n+gRy7hulfA0qYQ5Bh7dXOX5CcZd+kWPY="; + x64-linux_hash = "sha256-rHm2qDBDBPioAyN3SYw1CbCTDBA5PhF72Yd/LcpXGbI="; + arm64-linux_hash = "sha256-ukwLekQ5kI7eXdydHXDev1WkISHR2vUQGtNd0njWyy0="; + x64-osx_hash = "sha256-0ZzGcfMl3Q3vLSdN0j8B8NL1dQLvJn/lqKyprguexQI="; + arm64-osx_hash = "sha256-aM9bmPW6Vv2D6lIKfT5+uuUXfq/xqxNuHAysEYUFzt4="; } ."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "radarr"; - version = "5.24.1.10017"; + version = "5.25.0.10024"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz"; From e613166d54930d33723765644c74faa1303f6b29 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Jun 2025 11:16:19 +0000 Subject: [PATCH 029/115] jetty: 12.0.21 -> 12.0.22 --- pkgs/servers/http/jetty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index d4ee7b36c5fc..b888873c4064 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -57,7 +57,7 @@ in }; jetty_12 = common { - version = "12.0.21"; - hash = "sha256-U/W6h0S7b0zLoYahDGo/pkKa+NIMKR0tiX3pyRl40zg="; + version = "12.0.22"; + hash = "sha256-Ey3z+C+cBh8clWqcGULEsQQcbSbuaGwGr+arJE+GChs="; }; } From dfe96eaf5729e2530c964a152a80a6f980a6ac2e Mon Sep 17 00:00:00 2001 From: bokicoder <1556588440@qq.com> Date: Fri, 6 Jun 2025 19:51:05 +0800 Subject: [PATCH 030/115] niriswitcher: 0.5.2 -> 0.6.1 --- pkgs/by-name/ni/niriswitcher/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/niriswitcher/package.nix b/pkgs/by-name/ni/niriswitcher/package.nix index c40357fbae9b..00eeca3116c4 100644 --- a/pkgs/by-name/ni/niriswitcher/package.nix +++ b/pkgs/by-name/ni/niriswitcher/package.nix @@ -6,18 +6,19 @@ gobject-introspection, gtk4-layer-shell, libadwaita, + nix-update-script, }: python3Packages.buildPythonPackage rec { pname = "niriswitcher"; - version = "0.5.2"; + version = "0.6.1"; pyproject = true; src = fetchFromGitHub { owner = "isaksamsten"; repo = "niriswitcher"; tag = version; - hash = "sha256-jXnob/CJ3wrqYhbFRu7TnnnCrsKaDazD3t9lZoJVhdQ="; + hash = "sha256-njEd9s432qlBeQSXRL5gDSIEgzF0qwceND09aGTRo0U="; }; build-system = [ python3Packages.hatchling ]; @@ -43,6 +44,8 @@ python3Packages.buildPythonPackage rec { ) ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Application switcher for niri"; homepage = "https://github.com/isaksamsten/niriswitcher"; From 1c3fc325e9105ec24db9f839daaba3650774ff82 Mon Sep 17 00:00:00 2001 From: Anton Curanz Date: Fri, 6 Jun 2025 16:52:28 +0200 Subject: [PATCH 031/115] iterm2: 3.5.11 -> 3.5.14 --- pkgs/by-name/it/iterm2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/it/iterm2/package.nix b/pkgs/by-name/it/iterm2/package.nix index 2fd490ef1896..b441940fb430 100644 --- a/pkgs/by-name/it/iterm2/package.nix +++ b/pkgs/by-name/it/iterm2/package.nix @@ -15,13 +15,13 @@ stdenvNoCC.mkDerivation rec { pname = "iterm2"; - version = "3.5.11"; + version = "3.5.14"; src = fetchzip { url = "https://iterm2.com/downloads/stable/iTerm2-${ lib.replaceStrings [ "." ] [ "_" ] version }.zip"; - hash = "sha256-vcZL74U9RNjhpIQRUUn6WueYhE/LfLqpb/JgWunY5dI="; + hash = "sha256-cF7gg4kT0z/7Qu7d6AyXpnvrSQ937JbFUgpXw5F4AWE="; }; dontFixup = true; From 50c07342ba9c8305e556610c81c035f6e2acd3ce Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Fri, 6 Jun 2025 11:15:56 -0400 Subject: [PATCH 032/115] packer: 1.13.0 -> 1.13.1 Diff: https://github.com/hashicorp/packer/compare/v1.13.0...v1.13.1 Changelog: https://github.com/hashicorp/packer/blob/v1.13.1/CHANGELOG.md --- pkgs/by-name/pa/packer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/packer/package.nix b/pkgs/by-name/pa/packer/package.nix index 2205a6059f8e..34261019629b 100644 --- a/pkgs/by-name/pa/packer/package.nix +++ b/pkgs/by-name/pa/packer/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "packer"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - hash = "sha256-MWVNDRtvH33fby17rj8Fdc/14NGuxWIRNG6B+onUK+M="; + hash = "sha256-8DKMRiqv0XasLvFHGscpet51ZLVJjWjAYP8bLgVRIyQ="; }; vendorHash = "sha256-aXeYGyMn+lnsfcQMJXRt1uZsdi9np26sMna6Ch1swbg="; From c75b5648fbc6d04c88ec2ed9e7bfa2d244646a2e Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Fri, 6 Jun 2025 18:02:17 +0000 Subject: [PATCH 033/115] _1oom: reorder attributes from nixpkgs-hammering --- pkgs/by-name/_1/_1oom/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/_1/_1oom/package.nix b/pkgs/by-name/_1/_1oom/package.nix index 1c9a9675ee5d..0be8e12228e0 100644 --- a/pkgs/by-name/_1/_1oom/package.nix +++ b/pkgs/by-name/_1/_1oom/package.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "1oom"; version = "1.11.6"; + outputs = [ + "out" + "doc" + ]; + src = fetchFromGitHub { owner = "1oom-fork"; repo = "1oom"; @@ -23,9 +28,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-w67BjS5CrQviMXOeKNWGR1SzDeJHZrIpY7FDGt86CPA="; }; - strictDeps = true; - enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook SDL2 @@ -39,10 +41,8 @@ stdenv.mkDerivation (finalAttrs: { readline ]; - outputs = [ - "out" - "doc" - ]; + strictDeps = true; + enableParallelBuilding = true; postInstall = '' install -d $doc/share/doc/1oom From 54e1818d136b5e437b58d2be4923b836caacac13 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 01:49:28 +0000 Subject: [PATCH 034/115] maeparser: 1.3.2 -> 1.3.3 --- pkgs/by-name/ma/maeparser/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/maeparser/package.nix b/pkgs/by-name/ma/maeparser/package.nix index 715baa4b184f..f70136f826b0 100644 --- a/pkgs/by-name/ma/maeparser/package.nix +++ b/pkgs/by-name/ma/maeparser/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "maeparser"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "schrodinger"; repo = "maeparser"; rev = "v${version}"; - sha256 = "sha256-LTE1YGw6DiWnpUGB9x3vFVArcYd8zO49b4tqpqK30eA="; + sha256 = "sha256-xRyf/n8ezmMPMhlQFapVpnT2LReLe7spXB9jFC+VPRA="; }; nativeBuildInputs = [ cmake ]; From abb7d30ed1e21c1fadf0d6d2d9ba84a7139ead67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 02:29:22 +0000 Subject: [PATCH 035/115] valijson: 1.0.5 -> 1.0.6 --- pkgs/by-name/va/valijson/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/va/valijson/package.nix b/pkgs/by-name/va/valijson/package.nix index 56080eb000f2..ec2cddb512c9 100644 --- a/pkgs/by-name/va/valijson/package.nix +++ b/pkgs/by-name/va/valijson/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "valijson"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "tristanpenman"; repo = "valijson"; rev = "v${version}"; - hash = "sha256-f/pYJTvtSXtAmVbKWQfcz/jGSdj7Yt2HNvlCFHx871Q="; + hash = "sha256-3hQrCCDOrJx4XwTzJNTRPLghd+uoWKVDISa8rLaGiRM="; }; nativeBuildInputs = [ From bf34b9baf4115464126b0a2db865493d8ecdc472 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 02:53:11 +0000 Subject: [PATCH 036/115] reindeer: 2025.05.26.00 -> 2025.06.02.00 --- pkgs/by-name/re/reindeer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix index 97fe361b4546..beffff2eaddf 100644 --- a/pkgs/by-name/re/reindeer/package.nix +++ b/pkgs/by-name/re/reindeer/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "2025.05.26.00"; + version = "2025.06.02.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "reindeer"; tag = "v${version}"; - hash = "sha256-I5I5m9UutBMgX7PygPjMgglqvRfZxuWiyJ4l+77WYAQ="; + hash = "sha256-bKsMR3ubAfeZNVA3Q7RpDmaD9UlZUkVWTi5zevytOj0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-i0HAT8L9rf0r/jOqDFe60PakXwHz9lr4gwXm0ZwN4No="; + cargoHash = "sha256-PNCcTztLMt0d8L+tcvOgl4y85Zs4CJR6fDehUImNu6Y="; nativeBuildInputs = [ pkg-config ]; From be22ec2db8a2f0f12c9166f50e9f199547007026 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 03:05:28 +0000 Subject: [PATCH 037/115] terraform-providers.datadog: 3.63.0 -> 3.65.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b639f5767dc8..bd67860d334a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -326,13 +326,13 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-+C+pvw3ghriw3mR/lvpsSH0inTMPNwc6QAEtt6nXINw=", + "hash": "sha256-6X8gdM0xrkquO9BgxqygzfKUGKXE8Vum9+oqLzOihY4=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.63.0", + "rev": "v3.65.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-FmNeAwJ/lZZEIGt5QlYm9Cqu2cgkXVa1B/ej+5/G7wg=" + "vendorHash": "sha256-fXqX8Uhqq93/ZIGOKtP5hRlGHyXF8EuIBOoAv752pmg=" }, "deno": { "hash": "sha256-7IvJrhXMeAmf8e21QBdYNSJyVMEzLpat4Tm4zHWglW8=", From a07de4c4328acf5980ad250bf86ed0211598bcfd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 03:16:02 +0000 Subject: [PATCH 038/115] terraform-providers.venafi: 0.22.0 -> 0.22.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b639f5767dc8..7b009650666a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1427,11 +1427,11 @@ "vendorHash": "sha256-eCIJ2w8DjmUCGp0VbliLaQ6C29mJhl6Spya06Xyiqd4=" }, "venafi": { - "hash": "sha256-vMZH0BQMkoizbME1pYCn+iMqwI8aSvhe0Dcrvstzots=", + "hash": "sha256-9/rFRZz5KqfUnX3/Dp8CVfGOtlEVu6HuYsUT2WVAPg0=", "homepage": "https://registry.terraform.io/providers/Venafi/venafi", "owner": "Venafi", "repo": "terraform-provider-venafi", - "rev": "v0.22.0", + "rev": "v0.22.1", "spdx": "MPL-2.0", "vendorHash": "sha256-OUQgisFi8ZR/Hv70pKB5Kwdk+Rd/Ll6qx3vKaX4NNtA=" }, From 5189f3a24b6ff439ae8bf4f148c9a56813ecd756 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 04:38:24 +0000 Subject: [PATCH 039/115] nvidia-container-toolkit: 1.17.7 -> 1.17.8 --- pkgs/by-name/nv/nvidia-container-toolkit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix index cb37cc67276a..f8df68b9452c 100644 --- a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix +++ b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix @@ -27,13 +27,13 @@ let in buildGoModule rec { pname = "nvidia-container-toolkit"; - version = "1.17.7"; + version = "1.17.8"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-container-toolkit"; rev = "v${version}"; - hash = "sha256-AQi61oot4fdMvQ8A139AvygxN9U7EM1YkJau3zAy3+I="; + hash = "sha256-B17cPxdrQ8qMNgFh4XcDwwKryukMrn0GV2LNPHM7kBo="; }; From 957a60419482bc002357fa26cb671516ee48a8e9 Mon Sep 17 00:00:00 2001 From: emaryn Date: Sat, 7 Jun 2025 13:18:19 +0800 Subject: [PATCH 040/115] xa: 2.3.14 -> 2.4.1 --- pkgs/by-name/xa/xa/package.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/xa/xa/package.nix b/pkgs/by-name/xa/xa/package.nix index 97ef84c90f6e..a2427e188dd5 100644 --- a/pkgs/by-name/xa/xa/package.nix +++ b/pkgs/by-name/xa/xa/package.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "xa"; - version = "2.3.14"; + version = "2.4.1"; src = fetchurl { urls = [ "https://www.floodgap.com/retrotech/xa/dists/xa-${finalAttrs.version}.tar.gz" "https://www.floodgap.com/retrotech/xa/dists/unsupported/xa-${finalAttrs.version}.tar.gz" ]; - hash = "sha256-G5u6vdvY07lBC4UuUKEo7qQeaBM55vdsPoB2+lQg8C4="; + hash = "sha256-Y8EqajKo42TzTwSdiyR39GVgIUGPCLjWtGK+DtO+OsM="; }; nativeCheckInputs = [ perl ]; @@ -23,19 +23,18 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace Makefile \ - --replace "CC = gcc" "CC = ${stdenv.cc.targetPrefix}cc" \ - --replace "LD = gcc" "LD = ${stdenv.cc.targetPrefix}cc" \ - --replace "CFLAGS = -O2" "CFLAGS ?=" \ - --replace "LDFLAGS = -lc" "LDFLAGS ?= -lc" + --replace-fail "CC = gcc" "CC = ${stdenv.cc.targetPrefix}cc" \ + --replace-fail "LD = gcc" "LD = ${stdenv.cc.targetPrefix}cc" \ + --replace-fail "CFLAGS = -O2" "CFLAGS ?=" \ + --replace-fail "LDFLAGS = -lc" "LDFLAGS ?= -lc" \ + --replace-fail "install: all" "install:" ''; - makeFlags = [ - "DESTDIR:=${placeholder "out"}" - ]; + makeFlags = [ "DESTDIR:=${placeholder "out"}" ]; enableParallelBuilding = true; - doCheck = true; + doCheck = false; # while opening file: stat: No such file or directory [Makefile:21: test1.o65] # Running tests in parallel does not work enableParallelChecking = false; @@ -63,8 +62,9 @@ stdenv.mkDerivation (finalAttrs: { suite, as well as "bare" plain binary object files - block structure for label scoping ''; + mainProgram = "xa"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ]; - platforms = with lib.platforms; unix; + maintainers = [ ]; + platforms = lib.platforms.unix; }; }) From 6e151442ac267b7c58bc1af74e099506fa9b3f3b Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 7 Jun 2025 13:23:27 +0800 Subject: [PATCH 041/115] luau: 0.676 -> 0.677 --- pkgs/by-name/lu/luau/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix index 00abcd3a3d91..4fc41cbfd764 100644 --- a/pkgs/by-name/lu/luau/package.nix +++ b/pkgs/by-name/lu/luau/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luau"; - version = "0.676"; + version = "0.677"; src = fetchFromGitHub { owner = "luau-lang"; repo = "luau"; tag = finalAttrs.version; - hash = "sha256-Zmg1ah5um9ByBTvuDTrEBg1V2qlrg7AQcOlJvK5u/cg="; + hash = "sha256-cX0WoiK1CZBwPrQfYSJAGcQzM91Trn3PGsQigGX8jds="; }; nativeBuildInputs = [ cmake ]; From a05544193c90f30394930f54de0446228983a292 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 05:57:44 +0000 Subject: [PATCH 042/115] glaze: 5.3.0 -> 5.4.0 --- pkgs/by-name/gl/glaze/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix index d817d0f3afdb..1e35c5e57f62 100644 --- a/pkgs/by-name/gl/glaze/package.nix +++ b/pkgs/by-name/gl/glaze/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (final: { pname = "glaze"; - version = "5.3.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "stephenberry"; repo = "glaze"; rev = "v${final.version}"; - hash = "sha256-o0+V5mSMSHMDm7XEIVn/zHWJoFuGePOSzdLAxmOMxUM="; + hash = "sha256-AG6fnax9UZEhGtAUc8bgGijk8q7ge6lDTb0XjqL+kks="; }; nativeBuildInputs = [ cmake ]; From 23f5c1fc0b673c67f1694a98caa3f77fa41db4a2 Mon Sep 17 00:00:00 2001 From: PandapipBot <{{ env.EMAIL }}> Date: Sat, 7 Jun 2025 06:17:51 +0000 Subject: [PATCH 043/115] vscode-extensions.reditorsupport.r: 2.8.5 -> 2.8.6 --- .../editors/vscode/extensions/reditorsupport.r/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix index 86b8bd729f71..85359d2a95ca 100644 --- a/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix +++ b/pkgs/applications/editors/vscode/extensions/reditorsupport.r/default.nix @@ -12,8 +12,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "r"; publisher = "reditorsupport"; - version = "2.8.5"; - hash = "sha256-cZeZdrViEae9sRb9GyB/LeSQ5NRb/fAp3qQW9mPMbsM="; + version = "2.8.6"; + hash = "sha256-T/Qh0WfTfXMzPonbg9NMII5qFptfNoApFFiZCT5rR3Y="; }; nativeBuildInputs = [ jq From 74cfa2907cd8175333e95434f7b3eb64aaafc586 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 07:27:54 +0000 Subject: [PATCH 044/115] python3Packages.pydmd: 2025.05.01 -> 2025.06.01 --- pkgs/development/python-modules/pydmd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydmd/default.nix b/pkgs/development/python-modules/pydmd/default.nix index 5e6497df2805..b5041e8e73ff 100644 --- a/pkgs/development/python-modules/pydmd/default.nix +++ b/pkgs/development/python-modules/pydmd/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "pydmd"; - version = "2025.05.01"; + version = "2025.06.01"; pyproject = true; src = fetchFromGitHub { owner = "PyDMD"; repo = "PyDMD"; tag = version; - hash = "sha256-+ol103I4lrTVvANAK5k6bFfeUWj04YlkAqJUW8cw42Q="; + hash = "sha256-u8dW90FZSZaVbPNeILeZyOwAU0WOAeTAMCHpe7n4Bi4="; }; postPatch = '' From e7f3d2e21340d5ad325796dc85ec3edca3f8744d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 08:32:04 +0000 Subject: [PATCH 045/115] ripsecrets: 0.1.9 -> 0.1.11 --- pkgs/by-name/ri/ripsecrets/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ri/ripsecrets/package.nix b/pkgs/by-name/ri/ripsecrets/package.nix index f9c77fe673de..e0d11ed83beb 100644 --- a/pkgs/by-name/ri/ripsecrets/package.nix +++ b/pkgs/by-name/ri/ripsecrets/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "ripsecrets"; - version = "0.1.9"; + version = "0.1.11"; src = fetchFromGitHub { owner = "sirwart"; repo = "ripsecrets"; rev = "v${version}"; - hash = "sha256-lmahS/0W5075vdPfj4QnX7ZvrxHi986/92PRrplFblg="; + hash = "sha256-JCImUgicoXII64rK/Hch/0gJQE81Fw3h512w/vHUwAI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-AO0EL2JNwrqwUa7QLNB8/fjLP3HzBqidHR21YSmrMqg="; + cargoHash = "sha256-2HsUNN3lyGb/eOUEN/vTOQbAy59DQSzIaOqdk9+KhfU="; meta = with lib; { description = "Command-line tool to prevent committing secret keys into your source code"; From 82748eb1c243ef84e171da59e319363cc845ec48 Mon Sep 17 00:00:00 2001 From: emaryn Date: Sat, 7 Jun 2025 16:45:18 +0800 Subject: [PATCH 046/115] qmplay2: 24.06.16 -> 25.01.19 --- pkgs/by-name/qm/qmplay2/package.nix | 4 +++- pkgs/by-name/qm/qmplay2/sources.nix | 13 +++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/qm/qmplay2/package.nix b/pkgs/by-name/qm/qmplay2/package.nix index 8de3a25b0c95..2b367367c52c 100644 --- a/pkgs/by-name/qm/qmplay2/package.nix +++ b/pkgs/by-name/qm/qmplay2/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, alsa-lib, callPackage, cmake, @@ -19,7 +20,6 @@ pkg-config, qt5, qt6, - stdenv, taglib, vulkan-headers, vulkan-tools, @@ -43,6 +43,8 @@ stdenv.mkDerivation (finalAttrs: { cp -va ${sources.qmvk.src}/* qmvk/ chmod --recursive 744 qmvk popd + substituteInPlace src/qmplay2/vulkan/VulkanWindow.cpp \ + --replace-fail "getSubmitInfo()" "getSubmitInfo(0)" ''; nativeBuildInputs = diff --git a/pkgs/by-name/qm/qmplay2/sources.nix b/pkgs/by-name/qm/qmplay2/sources.nix index e3cb9a89f2d6..2ddfe376a38b 100644 --- a/pkgs/by-name/qm/qmplay2/sources.nix +++ b/pkgs/by-name/qm/qmplay2/sources.nix @@ -5,13 +5,14 @@ let self = { pname = "qmplay2"; - version = "24.06.16"; + version = "25.01.19"; src = fetchFromGitHub { owner = "zaps166"; repo = "QMPlay2"; - rev = self.version; - hash = "sha256-HoFyC/OFmthUYfyo6//+KmBIq06MPb5GmDekJbnsz5o="; + tag = self.version; + hash = "sha256-Of/zEQ6o2J/wXfAoY10IPtCaMaSk8ux8L6MrimeMWVA="; + fetchSubmodules = true; }; }; in @@ -19,13 +20,13 @@ qmvk = { pname = "qmvk"; - version = "0-unstable-2024-04-19"; + version = "0-unstable-2025-06-05"; src = fetchFromGitHub { owner = "zaps166"; repo = "QmVk"; - rev = "5c5c2942255820b6343afdfeea0405cd3b36870e"; - hash = "sha256-viFM9N5PiSCgkGlxtrLFCVDIML/QyPiaPRX77RW2NNw="; + rev = "754e6ca4b65433cb500a797e86d48d899d5a41c2"; + hash = "sha256-t4fGIfZhZE8ShQGa1zMJLpnvCEfCdCeAWOKwF4+nFSw="; }; }; } From 3345f6a5ec536acc883c5a1819f62fc7609362ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 08:52:05 +0000 Subject: [PATCH 047/115] go-ios: 1.0.176 -> 1.0.177 --- pkgs/by-name/go/go-ios/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/go-ios/package.nix b/pkgs/by-name/go/go-ios/package.nix index df58a2f56ae3..0771c76b7bec 100644 --- a/pkgs/by-name/go/go-ios/package.nix +++ b/pkgs/by-name/go/go-ios/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "go-ios"; - version = "1.0.176"; + version = "1.0.177"; src = fetchFromGitHub { owner = "danielpaulus"; repo = "go-ios"; rev = "v${version}"; - sha256 = "sha256-YThPGxKtGEv/jTlvtWvdJFjk+1+GLuKAtH0ivNlmr6A="; + sha256 = "sha256-PfFDM/thq+OP3PeiX7qfBZYG//el0U3CkpJWzFbzVqs="; }; proxyVendor = true; From d9707037faaf55a875d4af928bcad4b13e698276 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 09:05:07 +0000 Subject: [PATCH 048/115] terraform-providers.signalfx: 9.13.2 -> 9.15.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b639f5767dc8..221f818afa6c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1192,13 +1192,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-rzYy/tDLfbgzbKSPJWTzSFcamLh0HyF50nbtUJYokL4=", + "hash": "sha256-VDBnZMvXEDjyDCC0fbm+kppglY9W83re6ABBsX6Ur+M=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v9.13.2", + "rev": "v9.15.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-/Lu1J/ZT5eq07quvqcm2N1dZPaWF23C5L5CVaUX7HaE=" + "vendorHash": "sha256-2q3IMGzGm7CVuzs+jfU2oUD+NGwck+ny8GwcMnKfU9U=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", From 91e28a4ee6689e3b8e8311929ce25e5b7a755c4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 09:38:08 +0000 Subject: [PATCH 049/115] python3Packages.aiovodafone: 1.0.0 -> 1.1.0 --- pkgs/development/python-modules/aiovodafone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiovodafone/default.nix b/pkgs/development/python-modules/aiovodafone/default.nix index 4d1e857a25e0..d7cf9c1ad6ba 100644 --- a/pkgs/development/python-modules/aiovodafone/default.nix +++ b/pkgs/development/python-modules/aiovodafone/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiovodafone"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiovodafone"; tag = "v${version}"; - hash = "sha256-qjhezzetTKBaPeToQ9TSZ3+epgW/nMsADVL3Hb4kTBU="; + hash = "sha256-xz5NilxPN5KyC4NYmx4Ax0L3khtD2oo3s7gxXWclCI4="; }; build-system = [ poetry-core ]; From a45ccb08f77dabb5e403a45f0e6431e1e4e2b169 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 10:14:41 +0000 Subject: [PATCH 050/115] virtnbdbackup: 2.28 -> 2.29 --- pkgs/by-name/vi/virtnbdbackup/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/virtnbdbackup/package.nix b/pkgs/by-name/vi/virtnbdbackup/package.nix index 1794c8d6e3a7..adbf64aad5ca 100644 --- a/pkgs/by-name/vi/virtnbdbackup/package.nix +++ b/pkgs/by-name/vi/virtnbdbackup/package.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "virtnbdbackup"; - version = "2.28"; + version = "2.29"; src = fetchFromGitHub { owner = "abbbi"; repo = "virtnbdbackup"; tag = "v${version}"; - hash = "sha256-oGvsqGraJs0UkmtRN8/2eSIKc0lDD/qxyTakrj3Sqno="; + hash = "sha256-KIxRYD+GogYpZnUaBdhFd52sO51Two2vzY4LYRJRCto="; }; build-system = with python3Packages; [ From e880de1d37b4054841eb562a72b33608f60bf3ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 10:54:46 +0000 Subject: [PATCH 051/115] httm: 0.47.1 -> 0.48.3 --- pkgs/by-name/ht/httm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ht/httm/package.nix b/pkgs/by-name/ht/httm/package.nix index 80c4f386db76..b6e147467da3 100644 --- a/pkgs/by-name/ht/httm/package.nix +++ b/pkgs/by-name/ht/httm/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.47.1"; + version = "0.48.3"; src = fetchFromGitHub { owner = "kimono-koans"; repo = "httm"; rev = version; - hash = "sha256-quIyyGz9tA0WdfpftbgPZ83YynL/9SV0jRZW+zp0voI="; + hash = "sha256-55rUNITdz8lM0yuQQrNhXCKxwx4m7FPVhE1usEAVj0I="; }; useFetchCargoVendor = true; - cargoHash = "sha256-cPcQ0RPuTW3z4hv9EZGOqp0SY/4HtJ3fGuelqEQwFtE="; + cargoHash = "sha256-Hbn+PlmJ9FiwHme3kXjvG7m2rkgR4nGnpTT04JHJrao="; nativeBuildInputs = [ installShellFiles ]; From 4110183daeb6f12a1155e1bcd96288034b668b04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 12:02:14 +0000 Subject: [PATCH 052/115] python3Packages.pycron: 3.1.2 -> 3.2.0 --- pkgs/development/python-modules/pycron/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycron/default.nix b/pkgs/development/python-modules/pycron/default.nix index 121f69d3803d..a31c54f1758f 100644 --- a/pkgs/development/python-modules/pycron/default.nix +++ b/pkgs/development/python-modules/pycron/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pycron"; - version = "3.1.2"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "kipe"; repo = "pycron"; tag = version; - hash = "sha256-WnaQfS3VzF9fZHX9eNRjih/U7SgWeWVynLdwPZgF950="; + hash = "sha256-AuDqElqu/cbTASHQfWM85JHu8DvkwArZ2leMZSB+XVM="; }; build-system = [ poetry-core ]; From efbe0b1ab43d4f7fbd4ef16fe6466c4e18541fb0 Mon Sep 17 00:00:00 2001 From: patka Date: Sat, 7 Jun 2025 14:19:19 +0200 Subject: [PATCH 053/115] rainfrog: 0.3.1 -> 0.3.2 release notes: https://github.com/achristmascarl/rainfrog/releases/tag/v0.3.2 --- pkgs/by-name/ra/rainfrog/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix index 5f3185c7de83..d9293282a739 100644 --- a/pkgs/by-name/ra/rainfrog/package.nix +++ b/pkgs/by-name/ra/rainfrog/package.nix @@ -7,7 +7,7 @@ rainfrog, }: let - version = "0.3.1"; + version = "0.3.2"; in rustPlatform.buildRustPackage { inherit version; @@ -17,11 +17,11 @@ rustPlatform.buildRustPackage { owner = "achristmascarl"; repo = "rainfrog"; tag = "v${version}"; - hash = "sha256-sUZnHlTxOz0j2KsWi/qaI5MYT0mkANn6deH54TS/JYw="; + hash = "sha256-3oRuJytFGPfWLoxtrpgEwRWAPE8HGct5PqU1mxDinZs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-wgJWPlURS2DxcRMzDEAXa50nQswcjbe0zj2QgF0HZys="; + cargoHash = "sha256-W/3UNZw3gHVI/3uIzyaDmKGjM8gsfcr86+Vxlfm9Yb4="; passthru = { tests.version = testers.testVersion { From 5d59a9150ca793d2fbcb81f5ec0f2404aacb0988 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 7 Jun 2025 20:12:59 +0800 Subject: [PATCH 054/115] nixosTests.cntr: use lib.genAttrs --- nixos/tests/cntr.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/tests/cntr.nix b/nixos/tests/cntr.nix index b7ae93f622ff..33c21dd2252d 100644 --- a/nixos/tests/cntr.nix +++ b/nixos/tests/cntr.nix @@ -92,7 +92,4 @@ in { nixos-container = mkContainersTest; } -// (lib.foldl' (attrs: backend: attrs // { ${backend} = mkOCITest backend; }) { } [ - "docker" - "podman" -]) +// (lib.genAttrs [ "docker" "podman" ] mkOCITest) From b22b3dba4cd53312a16243e3682cef5fce6545e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 12:43:01 +0000 Subject: [PATCH 055/115] jbang: 0.126.1 -> 0.126.2 --- pkgs/by-name/jb/jbang/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/jb/jbang/package.nix b/pkgs/by-name/jb/jbang/package.nix index c044bad5f373..2676ee83eb43 100644 --- a/pkgs/by-name/jb/jbang/package.nix +++ b/pkgs/by-name/jb/jbang/package.nix @@ -9,12 +9,12 @@ }: stdenv.mkDerivation rec { - version = "0.126.1"; + version = "0.126.2"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-lFb8j1hl47buUKZjFNuSaQVr5IW++eame5vPi2Vi1o8="; + sha256 = "sha256-sSmkY1OSaPsxoRTrvl/L3LjWexZeLn5t3s8VFGBGTyw="; }; nativeBuildInputs = [ makeWrapper ]; From b199e4828dbd772a2daed99515ec7f76f2829996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=AErekc=C3=A4H=20nitraM=E2=80=AE?= Date: Thu, 5 Jun 2025 23:43:15 +0200 Subject: [PATCH 056/115] korrect: update to 0.2.1 --- pkgs/by-name/ko/korrect/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ko/korrect/package.nix b/pkgs/by-name/ko/korrect/package.nix index e531d4fda67d..40a66a0fc3ba 100644 --- a/pkgs/by-name/ko/korrect/package.nix +++ b/pkgs/by-name/ko/korrect/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "korrect"; - version = "0.1.3"; + version = "0.2.1"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-U363YI1CQg7KAUtzN2GPm4fNnD3TgJy+6hT/3JZ8e2s="; + hash = "sha256-/tFrHTZ6YHnN9OvoHBJWEnwX780DYrs0f5wV1dPyAcc="; }; - cargoHash = "sha256-WP03Gv+Nai834xurVzdzV4uLA8fT/lbdu4zGWUgDKJo="; + cargoHash = "sha256-bG31pqI/eB+J0FUq/lWak6Ekf+00JiCfuKZdyUkIAAw="; passthru.updateScript = nix-update-script { }; From 58d74ee99053b14953a277164975d112ced2c9c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 13:52:47 +0000 Subject: [PATCH 057/115] kimai: 2.34.0 -> 2.35.1 --- pkgs/by-name/ki/kimai/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ki/kimai/package.nix b/pkgs/by-name/ki/kimai/package.nix index 51181a031333..3213062cf3f7 100644 --- a/pkgs/by-name/ki/kimai/package.nix +++ b/pkgs/by-name/ki/kimai/package.nix @@ -7,13 +7,13 @@ php.buildComposerProject2 (finalAttrs: { pname = "kimai"; - version = "2.34.0"; + version = "2.35.1"; src = fetchFromGitHub { owner = "kimai"; repo = "kimai"; tag = finalAttrs.version; - hash = "sha256-LxbECvOukhCA93jBvs/yOeBoGXmXgPGbKZrGppAWrYM="; + hash = "sha256-QcrlwKpnKuTrJ7U8BzUsxKnJoFzV/U+ZUj5v8FcJXvI="; }; php = php.buildEnv { @@ -38,7 +38,7 @@ php.buildComposerProject2 (finalAttrs: { ''; }; - vendorHash = "sha256-wCrj4HfqLj9gljkOGw8lNG9qsFHN9oXI1FjgRzPtwfI="; + vendorHash = "sha256-hENucMcLgG6w0hUF/tnXvFYssgqQLspD+36Jl4cJmig="; composerNoPlugins = false; composerNoScripts = false; From 1468544e38e7be1da914977c8f18ec2a52de9432 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 14:00:09 +0000 Subject: [PATCH 058/115] terraform-providers.routeros: 1.85.1 -> 1.85.3 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b639f5767dc8..7ed8d73f9d16 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1120,13 +1120,13 @@ "vendorHash": "sha256-KezwDRmQQj0MnmsVlrX1OhNG6oMgw8fCxX5VFGdUynw=" }, "routeros": { - "hash": "sha256-vL1ijiP+WDe8nqtSudOuOTPohHe8JRU6wF4el5P/pWg=", + "hash": "sha256-ciQsBvpX6gWnDPt9O1SGrVVgNCvAHBPCaLfVlPxrSAY=", "homepage": "https://registry.terraform.io/providers/terraform-routeros/routeros", "owner": "terraform-routeros", "repo": "terraform-provider-routeros", - "rev": "v1.85.1", + "rev": "v1.85.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-ysmNy+xojcHPSs++HofOxBKg1AlUO7taYVIcsmW/2kM=" + "vendorHash": "sha256-lurBPksF2+SPraQ6KRr4EmI8rR7lY9BN+LZY8pKHjYU=" }, "rundeck": { "hash": "sha256-cf+0qXpgxIsc/JbB7+u3MpmWFwUmpsinp1uARRhuBw0=", From 51d12cde6e85a4e189539fe9a73e4f6bdc247afa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 14:13:08 +0000 Subject: [PATCH 059/115] diffedit3: 0.5.0 -> 0.6.0 --- pkgs/by-name/di/diffedit3/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/di/diffedit3/package.nix b/pkgs/by-name/di/diffedit3/package.nix index 15da490898e1..8ce05b1aa3dc 100644 --- a/pkgs/by-name/di/diffedit3/package.nix +++ b/pkgs/by-name/di/diffedit3/package.nix @@ -9,15 +9,15 @@ rustPlatform.buildRustPackage rec { pname = "diffedit3"; - version = "0.5.0"; + version = "0.6.0"; src = fetchCrate { inherit pname version; - hash = "sha256-zBdLz8O2WCR8SN0UXUAaEdIpmmL+LIaGt44STBw6nyU="; + hash = "sha256-o3Y3SQLkMxYMepGyvK6m/8aA5ZDwCAYdYUhGplkckjU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Ao2agqYChyrcrRVOjzKvPHYwmYGabQUVZAUaVBpAFJM="; + cargoHash = "sha256-XAtp5pCKFQRqyF9Y0udrcudgF5i3vWxk//kZ/hRsFaA="; passthru = { updateScript = nix-update-script { }; From 918ac8cf975046038583f6c4edae74fdbd9b899f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 24 May 2025 17:56:14 -0700 Subject: [PATCH 060/115] python3Packages.aiohttp: 3.11.18 -> 3.12.10 Diff: https://github.com/aio-libs/aiohttp/compare/refs/tags/v3.11.18...refs/tags/v3.12.10 Changelog: https://docs.aiohttp.org/en/v3.12.10/changes.html --- .../python-modules/aiohttp/default.nix | 37 ++++++++---- .../aiohttp/unvendor-llhttp.patch | 60 ------------------- 2 files changed, 25 insertions(+), 72 deletions(-) delete mode 100644 pkgs/development/python-modules/aiohttp/unvendor-llhttp.patch diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index accf8af4f1f8..d331adf8f8cb 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -8,7 +8,8 @@ isPyPy, # build-system - cython, + cython_3_1, + pkgconfig, setuptools, # native dependencies @@ -30,8 +31,10 @@ brotlicffi, # tests + blockbuster, freezegun, gunicorn, + isal, proxy-py, pytest-codspeed, pytest-cov-stub, @@ -41,35 +44,34 @@ python-on-whales, re-assert, trustme, + zlib-ng, }: buildPythonPackage rec { pname = "aiohttp"; - version = "3.11.18"; + version = "3.12.10"; pyproject = true; src = fetchFromGitHub { owner = "aio-libs"; repo = "aiohttp"; tag = "v${version}"; - hash = "sha256-+vnrYdUz1Stti9XE99InAouKN5kfTSaOuEG9Anxb3gs="; + hash = "sha256-ciZGOOfVXYoLzYNIkota3MXMRMxlztf+mFFo0y9r+Lk="; }; - patches = [ - (replaceVars ./unvendor-llhttp.patch { - llhttpDev = lib.getDev llhttp; - llhttpLib = lib.getLib llhttp; - }) - ]; - postPatch = '' rm -r vendor patchShebangs tools touch .git # tools/gen.py uses .git to find the project root + + # don't install Cython using pip + substituteInPlace Makefile \ + --replace-fail "cythonize: .install-cython" "cythonize:" ''; build-system = [ - cython + cython_3_1 + pkgconfig setuptools ]; @@ -77,6 +79,12 @@ buildPythonPackage rec { make cythonize ''; + buildInputs = [ + llhttp + ]; + + env.AIOHTTP_USE_SYSTEM_DEPS = true; + dependencies = [ aiohappyeyeballs aiosignal @@ -94,8 +102,10 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + blockbuster freezegun gunicorn + isal proxy-py pytest-codspeed pytest-cov-stub @@ -105,6 +115,7 @@ buildPythonPackage rec { python-on-whales re-assert trustme + zlib-ng ]; disabledTests = @@ -117,6 +128,8 @@ buildPythonPackage rec { "test_import_time" # racy "test_uvloop_secure_https_proxy" + # Cannot connect to host example.com:443 ssl:default [Could not contact DNS servers] + "test_tcp_connector_ssl_shutdown_timeout_passed_to_create_connection" ] # these tests fail with python310 but succeeds with 11+ ++ lib.optionals isPy310 [ @@ -145,7 +158,7 @@ buildPythonPackage rec { ''; meta = with lib; { - changelog = "https://github.com/aio-libs/aiohttp/blob/v${version}/CHANGES.rst"; + changelog = "https://docs.aiohttp.org/en/${src.tag}/changes.html"; description = "Asynchronous HTTP Client/Server for Python and asyncio"; license = licenses.asl20; homepage = "https://github.com/aio-libs/aiohttp"; diff --git a/pkgs/development/python-modules/aiohttp/unvendor-llhttp.patch b/pkgs/development/python-modules/aiohttp/unvendor-llhttp.patch deleted file mode 100644 index 5fad9427371d..000000000000 --- a/pkgs/development/python-modules/aiohttp/unvendor-llhttp.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/Makefile b/Makefile -index b0a3ef32..f36132c6 100644 ---- a/Makefile -+++ b/Makefile -@@ -79,7 +79,7 @@ vendor/llhttp/node_modules: vendor/llhttp/package.json - generate-llhttp: .llhttp-gen - - .PHONY: cythonize --cythonize: .install-cython $(PYXS:.pyx=.c) aiohttp/_websocket/reader_c.c -+cythonize: $(PYXS:.pyx=.c) aiohttp/_websocket/reader_c.c - - .install-deps: .install-cython $(PYXS:.pyx=.c) aiohttp/_websocket/reader_c.c $(call to-hash,$(CYS) $(REQS)) - @python -m pip install -r requirements/dev.in -c requirements/dev.txt -diff --git a/aiohttp/_cparser.pxd b/aiohttp/_cparser.pxd -index c2cd5a92..9184ac60 100644 ---- a/aiohttp/_cparser.pxd -+++ b/aiohttp/_cparser.pxd -@@ -1,7 +1,7 @@ - from libc.stdint cimport int32_t, uint8_t, uint16_t, uint64_t - - --cdef extern from "../vendor/llhttp/build/llhttp.h": -+cdef extern from "@llhttpDev@/include/llhttp.h": - - struct llhttp__internal_s: - int32_t _index -diff --git a/setup.py b/setup.py -index 2f024e87..feebc638 100644 ---- a/setup.py -+++ b/setup.py -@@ -17,13 +17,6 @@ if sys.implementation.name != "cpython": - NO_EXTENSIONS = True - - --if IS_GIT_REPO and not (HERE / "vendor/llhttp/README.md").exists(): -- print("Install submodules when building from git clone", file=sys.stderr) -- print("Hint:", file=sys.stderr) -- print(" git submodule update --init", file=sys.stderr) -- sys.exit(2) -- -- - # NOTE: makefile cythonizes all Cython modules - - extensions = [ -@@ -33,12 +26,11 @@ extensions = [ - [ - "aiohttp/_http_parser.c", - "aiohttp/_find_header.c", -- "vendor/llhttp/build/c/llhttp.c", -- "vendor/llhttp/src/native/api.c", -- "vendor/llhttp/src/native/http.c", - ], - define_macros=[("LLHTTP_STRICT_MODE", 0)], -- include_dirs=["vendor/llhttp/build"], -+ include_dirs=["@llhttpDev@/include"], -+ library_dirs=["@llhttpLib@/lib"], -+ libraries=["llhttp"], - ), - Extension("aiohttp._http_writer", ["aiohttp/_http_writer.c"]), - Extension("aiohttp._websocket.reader_c", ["aiohttp/_websocket/reader_c.c"]), From 6fe202161b5a1f752501a533286d525dfabb2ab1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Jun 2025 16:57:10 +0200 Subject: [PATCH 061/115] python3Packages.aiohttp-fast-zlib: 0.2.3 -> 0.3.0 https://github.com/bdraco/aiohttp-fast-zlib/blob/refs/tags/v0.3.0/CHANGELOG.md --- pkgs/development/python-modules/aiohttp-fast-zlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix b/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix index 691166682984..c09037e69f58 100644 --- a/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix +++ b/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "aiohttp-fast-zlib"; - version = "0.2.3"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "bdraco"; repo = "aiohttp-fast-zlib"; tag = "v${version}"; - hash = "sha256-PQ44XFdaolxGQTwzssv1inOUAGAyYghS3SVLq4w5SoA="; + hash = "sha256-N38eMxxovpBM3n0cb7glKyBQ9GD79uyFxq5L4pKv248="; }; postPatch = '' From 30cd90382441804579a27feaef0f3f94d308ea73 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 15:02:36 +0000 Subject: [PATCH 062/115] expr: 1.17.4 -> 1.17.5 --- pkgs/by-name/ex/expr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ex/expr/package.nix b/pkgs/by-name/ex/expr/package.nix index 469cc2511e05..821bf75c95a0 100644 --- a/pkgs/by-name/ex/expr/package.nix +++ b/pkgs/by-name/ex/expr/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "expr"; - version = "1.17.4"; + version = "1.17.5"; src = fetchFromGitHub { owner = "expr-lang"; repo = "expr"; rev = "v${version}"; - hash = "sha256-Ss1rs4BiKFOSzfL6VXKZA2Z/LYJ9N+AYkgdVCeintOk="; + hash = "sha256-QghgSI6Ri8bXA2xnR0Eu582fLzQXVhLFI9Ul35h/l00="; }; sourceRoot = "${src.name}/repl"; - vendorHash = "sha256-mjqbO3qgX7ak8VRFHnz9UYNoOd+bbHBImDLvnaJhdqI="; + vendorHash = "sha256-COfYxqSRyhTJiINbR8z1mbCMrPRFjzkriBGZ5DIY4cg="; ldflags = [ "-s" From ccb7677ea6200588496b11bdc83fce5153af99cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 15:19:53 +0000 Subject: [PATCH 063/115] openapi-python-client: 0.24.3 -> 0.25.0 --- pkgs/by-name/op/openapi-python-client/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openapi-python-client/package.nix b/pkgs/by-name/op/openapi-python-client/package.nix index 834f6ff85784..53c804e7174e 100644 --- a/pkgs/by-name/op/openapi-python-client/package.nix +++ b/pkgs/by-name/op/openapi-python-client/package.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { pname = "openapi-python-client"; - version = "0.24.3"; + version = "0.25.0"; pyproject = true; src = fetchFromGitHub { @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { owner = "openapi-generators"; repo = "openapi-python-client"; tag = "v${version}"; - hash = "sha256-EAHwICY8bjqYt0yGSG+SMcyTqeftfGCGTE4pJE120Mo="; + hash = "sha256-bFGqOrBPoywx/r35zpViAWUGiF1ZL3IG1E3TA+Qa354="; }; nativeBuildInputs = From f9a394f234f0a2f8aea4f5d566399db4ff319ee9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 15:34:45 +0000 Subject: [PATCH 064/115] moar: 1.31.7 -> 1.31.8 --- pkgs/by-name/mo/moar/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/moar/package.nix b/pkgs/by-name/mo/moar/package.nix index 2f4a895588a0..547effbcf0ed 100644 --- a/pkgs/by-name/mo/moar/package.nix +++ b/pkgs/by-name/mo/moar/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "moar"; - version = "1.31.7"; + version = "1.31.8"; src = fetchFromGitHub { owner = "walles"; repo = "moar"; rev = "v${version}"; - hash = "sha256-0/V9baRscZFMyvVsSfmxZJdd22BgqqdGcKa7rh210x8="; + hash = "sha256-Ql2RWE8yttUSWZf4kJxv8l2lDBetJ7JB7W7A8GYVkyg="; }; vendorHash = "sha256-J9u7LxzXk4npRyymmMKyN2ZTmhT4WwKjy0X5ITcHtoE="; From 0ea1016b5f4495514fb06dd128fe2719e097116a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 16:32:13 +0000 Subject: [PATCH 065/115] python3Packages.django-ninja: 1.4.1 -> 1.4.3 --- pkgs/development/python-modules/django-ninja/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-ninja/default.nix b/pkgs/development/python-modules/django-ninja/default.nix index 7eee0ea340ad..1c6db42f84da 100644 --- a/pkgs/development/python-modules/django-ninja/default.nix +++ b/pkgs/development/python-modules/django-ninja/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "django-ninja"; - version = "1.4.1"; + version = "1.4.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vitalik"; repo = "django-ninja"; tag = "v${version}"; - hash = "sha256-96JnUFgfuElR7WpiExS2fmK1xxaosd77li36bTLS//U="; + hash = "sha256-6uef+e1o7XTp5MRi/NpsJGCFT28bh2UnKdS2IfzzmAY="; }; build-system = [ flit-core ]; From 132b818c738eeb61231c1ab9a0a4c68b61292fc5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 17:02:59 +0000 Subject: [PATCH 066/115] anyrun: 0-unstable-2025-05-19 -> 0-unstable-2025-05-27 --- pkgs/by-name/an/anyrun/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/anyrun/package.nix b/pkgs/by-name/an/anyrun/package.nix index 76061af6b4ab..b5eac7c362a4 100644 --- a/pkgs/by-name/an/anyrun/package.nix +++ b/pkgs/by-name/an/anyrun/package.nix @@ -17,13 +17,13 @@ rustPlatform.buildRustPackage { pname = "anyrun"; - version = "0-unstable-2025-05-19"; + version = "0-unstable-2025-05-27"; src = fetchFromGitHub { owner = "kirottu"; repo = "anyrun"; - rev = "54b462b87129cf059a348fc3a6cc170b9714e0e7"; - hash = "sha256-7VcdMOgQ/PRLr0bnJwNWZX7asrWbRJlLFw21xffm6g8="; + rev = "25367153f225a59c5ce5746583e39a71ff052f09"; + hash = "sha256-pg0w4uOZI32dLASD6UbBezeQg5PwOa0GLv7rTwn3VxY="; }; useFetchCargoVendor = true; From 1fd239539f1b48485f7dbad854676d752a332d3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 17:25:55 +0000 Subject: [PATCH 067/115] mapnik: 4.0.7 -> 4.1.0 --- pkgs/development/libraries/mapnik/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 3eeec023540e..358903ba9761 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "mapnik"; - version = "4.0.7"; + version = "4.1.0"; src = fetchFromGitHub { owner = "mapnik"; repo = "mapnik"; rev = "v${version}"; - hash = "sha256-gJktRWcJiSGxxjvWFt+Kl9d7g+TOSPk2PfGP0LIVxt4="; + hash = "sha256-EhRMG0xPOGwcRAMQD2B4z7nVlXQf4HFFfL3oUaUfXBY="; fetchSubmodules = true; }; From 1a3a6634b03e9a2b11eedc02677e66ee42d34476 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 17:44:21 +0000 Subject: [PATCH 068/115] gat: 0.24.0 -> 0.24.1 --- pkgs/by-name/ga/gat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ga/gat/package.nix b/pkgs/by-name/ga/gat/package.nix index 4375315e49b7..bb39911385dc 100644 --- a/pkgs/by-name/ga/gat/package.nix +++ b/pkgs/by-name/ga/gat/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gat"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "koki-develop"; repo = "gat"; tag = "v${version}"; - hash = "sha256-2AIRFG4YmEr1ZQ6JjhmRmOc5/BfTbeBd4azy1xQQr3Q="; + hash = "sha256-xP7xDuab8QH1PULgF8/FGwDNV/5bYqXkvxgR/Mk4GVw="; }; - vendorHash = "sha256-9LHTyIL0+aJAUJsn3m1SUrZYM9JLo70JY0zb1oVFJFo="; + vendorHash = "sha256-1uIpgcl+6H7aleW28YE8IidJysEB2n+wt2Dz0kZGNzk="; env.CGO_ENABLED = 0; From 5532e97e51da15f4f440907c7080735f417dad0f Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 7 Jun 2025 23:28:16 +0400 Subject: [PATCH 069/115] mapnik: modernize --- pkgs/development/libraries/mapnik/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 358903ba9761..f6e1270402f3 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -27,14 +27,14 @@ sparsehash, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mapnik"; version = "4.1.0"; src = fetchFromGitHub { owner = "mapnik"; repo = "mapnik"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-EhRMG0xPOGwcRAMQD2B4z7nVlXQf4HFFfL3oUaUfXBY="; fetchSubmodules = true; }; @@ -47,6 +47,8 @@ stdenv.mkDerivation rec { rm -r scons # Remove bundled 'sparsehash' directory in favor of 'sparsehash' package rm -r deps/mapnik/sparsehash + # Remove bundled 'protozero' directory in favor of 'protozero' package + rm -r deps/mapbox/protozero ''; # a distinct dev output makes python-mapnik fail @@ -118,19 +120,19 @@ stdenv.mkDerivation rec { ''; preInstall = '' - mkdir -p $out/bin - cp ../utils/mapnik-config/mapnik-config $out/bin/mapnik-config + install -Dm755 ../utils/mapnik-config/mapnik-config -t $out/bin ''; - meta = with lib; { + meta = { description = "Open source toolkit for developing mapping applications"; homepage = "https://mapnik.org"; - maintainers = with maintainers; [ + changelog = "https://github.com/mapnik/mapnik/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + maintainers = with lib.maintainers; [ hrdinka hummeltech ]; - teams = [ teams.geospatial ]; - license = licenses.lgpl21Plus; - platforms = platforms.all; + teams = [ lib.teams.geospatial ]; + license = lib.licenses.lgpl21Plus; + platforms = lib.platforms.all; }; -} +}) From a621ca0a23af34644a7967b47cf00582c55cf42a Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 7 Jun 2025 22:04:30 +0300 Subject: [PATCH 070/115] nixos/netadata: update capabilities --- nixos/modules/services/monitoring/netdata.nix | 34 +++++++++++-------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index 1d74b948d74e..5f1391238282 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -367,19 +367,25 @@ in # AmbientCapabilities AmbientCapabilities = lib.optional isThereAnyWireGuardTunnels "CAP_NET_ADMIN"; # Capabilities - CapabilityBoundingSet = [ - "CAP_DAC_OVERRIDE" # is required for freeipmi and slabinfo plugins - "CAP_DAC_READ_SEARCH" # is required for apps and systemd-journal plugin - "CAP_FOWNER" # is required for freeipmi plugin - "CAP_SETPCAP" # is required for apps, perf and slabinfo plugins - "CAP_SYS_ADMIN" # is required for perf plugin - "CAP_SYS_PTRACE" # is required for apps plugin - "CAP_SYS_RESOURCE" # is required for ebpf plugin - "CAP_NET_RAW" # is required for fping app - "CAP_SYS_CHROOT" # is required for cgroups plugin - "CAP_SETUID" # is required for cgroups and cgroups-network plugins - "CAP_SYSLOG" # is required for systemd-journal plugin - ] ++ lib.optional isThereAnyWireGuardTunnels "CAP_NET_ADMIN"; + CapabilityBoundingSet = + [ + "CAP_DAC_OVERRIDE" # is required for freeipmi and slabinfo plugins + "CAP_DAC_READ_SEARCH" # is required for apps and systemd-journal plugin + "CAP_NET_RAW" # is required for fping app + "CAP_PERFMON" # is required for perf plugin + "CAP_SETPCAP" # is required for apps, perf and slabinfo plugins + "CAP_SETUID" # is required for cgroups and cgroups-network plugins + "CAP_SYSLOG" # is required for systemd-journal plugin + "CAP_SYS_ADMIN" # is required for perf plugin + "CAP_SYS_CHROOT" # is required for cgroups plugin + "CAP_SYS_PTRACE" # is required for apps plugin + "CAP_SYS_RESOURCE" # is required for ebpf plugin + ] + ++ lib.optionals cfg.package.withIpmi [ + "CAP_FOWNER" + "CAP_SYS_RAWIO" + ] + ++ lib.optional isThereAnyWireGuardTunnels "CAP_NET_ADMIN"; # Sandboxing ProtectSystem = "full"; ProtectHome = "read-only"; @@ -464,7 +470,7 @@ in // lib.optionalAttrs (cfg.package.withIpmi) { "freeipmi.plugin" = { source = "${cfg.package}/libexec/netdata/plugins.d/freeipmi.plugin.org"; - capabilities = "cap_dac_override,cap_fowner+ep"; + capabilities = "cap_dac_override,cap_fowner,cap_sys_rawio+ep"; owner = cfg.user; group = cfg.group; permissions = "u+rx,g+x,o-rwx"; From 04ee58b6174f62c6e7e32edee41450af98333e5b Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 7 Jun 2025 23:44:07 +0400 Subject: [PATCH 071/115] mapnik: migrate to by-name --- .../libraries => by-name/ma}/mapnik/cmake-harfbuzz.patch | 0 .../ma}/mapnik/export-pkg-config-full-paths.patch | 0 .../mapnik/default.nix => by-name/ma/mapnik/package.nix} | 2 +- .../ma}/mapnik/use-sparsehash-package.patch | 0 pkgs/top-level/all-packages.nix | 6 ------ 5 files changed, 1 insertion(+), 7 deletions(-) rename pkgs/{development/libraries => by-name/ma}/mapnik/cmake-harfbuzz.patch (100%) rename pkgs/{development/libraries => by-name/ma}/mapnik/export-pkg-config-full-paths.patch (100%) rename pkgs/{development/libraries/mapnik/default.nix => by-name/ma/mapnik/package.nix} (98%) rename pkgs/{development/libraries => by-name/ma}/mapnik/use-sparsehash-package.patch (100%) diff --git a/pkgs/development/libraries/mapnik/cmake-harfbuzz.patch b/pkgs/by-name/ma/mapnik/cmake-harfbuzz.patch similarity index 100% rename from pkgs/development/libraries/mapnik/cmake-harfbuzz.patch rename to pkgs/by-name/ma/mapnik/cmake-harfbuzz.patch diff --git a/pkgs/development/libraries/mapnik/export-pkg-config-full-paths.patch b/pkgs/by-name/ma/mapnik/export-pkg-config-full-paths.patch similarity index 100% rename from pkgs/development/libraries/mapnik/export-pkg-config-full-paths.patch rename to pkgs/by-name/ma/mapnik/export-pkg-config-full-paths.patch diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/by-name/ma/mapnik/package.nix similarity index 98% rename from pkgs/development/libraries/mapnik/default.nix rename to pkgs/by-name/ma/mapnik/package.nix index f6e1270402f3..79a043b36e98 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/by-name/ma/mapnik/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { cairo freetype gdal - harfbuzz + (harfbuzz.override { withIcu = true; }) icu libjpeg libpng diff --git a/pkgs/development/libraries/mapnik/use-sparsehash-package.patch b/pkgs/by-name/ma/mapnik/use-sparsehash-package.patch similarity index 100% rename from pkgs/development/libraries/mapnik/use-sparsehash-package.patch rename to pkgs/by-name/ma/mapnik/use-sparsehash-package.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b20f87db9d05..36cac85f493f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9001,12 +9001,6 @@ with pkgs; asciidoc = asciidoc-full; }; - mapnik = callPackage ../development/libraries/mapnik { - harfbuzz = harfbuzz.override { - withIcu = true; - }; - }; - matterhorn = # TODO: Erroneous references to GHC on aarch64-darwin: https://github.com/NixOS/nixpkgs/issues/318013 ( From c1a93f9e7a7457d71a07eac076501dc2b422f6b3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 7 Jun 2025 20:23:41 +0200 Subject: [PATCH 072/115] home-assistant-custom-lovelace-modules.bubble-card: 2.4.0 -> 3.0.0-beta.9 https://github.com/Clooos/bubble-card/releases/tag/v3.0.0-beta.9 --- .../bubble-card/package.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix index 811709ef4d7f..c1d6d049dac4 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix @@ -1,28 +1,32 @@ { lib, - stdenv, + buildNpmPackage, fetchFromGitHub, }: -stdenv.mkDerivation rec { +buildNpmPackage rec { pname = "bubble-card"; - version = "2.4.0"; - - dontBuild = true; + version = "3.0.0-beta.9"; src = fetchFromGitHub { owner = "Clooos"; repo = "Bubble-Card"; rev = "v${version}"; - hash = "sha256-Hn6jH7lT+bjkOM/iRCmD1B8l6ZRqjNTmVMj4IN7ixE4="; + hash = "sha256-UgfbItYBaSiNvl3zmRrS3p/b22XwptCdIf7mA42rGXM="; }; + npmDepsHash = "sha256-NSHsw/+dmdc2+yo4/NgT0YMMrCuL8JjRR6MSJ5xQTiE="; + + preBuild = '' + rm -rf dist + ''; + + npmBuildScript = "dist"; + installPhase = '' runHook preInstall - mkdir $out - install -m0644 dist/bubble-card.js $out - install -m0644 dist/bubble-pop-up-fix.js $out + cp -rv dist $out runHook postInstall ''; From 625b1ca6489143dd135605bded2f22b4b44219bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 21:42:22 +0000 Subject: [PATCH 073/115] terraform-providers.google-beta: 6.37.0 -> 6.38.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b639f5767dc8..7c801ad44181 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -525,11 +525,11 @@ "vendorHash": "sha256-YZI6zhxXU2aABARP6GcTMeU98F4+imbL1vKIEMzsJHM=" }, "google-beta": { - "hash": "sha256-VpfIfzIG1h5qnvEqogCK359LLLSgdgxg0DtRGvdZtLU=", + "hash": "sha256-9VjgTc0vCXxPEbuycMbxWdbwnhz/4Clff3GcMZ+zKoc=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v6.37.0", + "rev": "v6.38.0", "spdx": "MPL-2.0", "vendorHash": "sha256-oz4zVv5swFokYCdcJhBE+PLrIOjwszl58Cn0e7hOKmI=" }, From 3198adc89a44a5da34af63641a72e23888595d38 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 22:05:06 +0000 Subject: [PATCH 074/115] terraform-providers.rundeck: 0.5.1 -> 0.5.2 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b639f5767dc8..d9ca54c0ab2e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1129,11 +1129,11 @@ "vendorHash": "sha256-ysmNy+xojcHPSs++HofOxBKg1AlUO7taYVIcsmW/2kM=" }, "rundeck": { - "hash": "sha256-cf+0qXpgxIsc/JbB7+u3MpmWFwUmpsinp1uARRhuBw0=", + "hash": "sha256-g8unbz8+UGLiAOJju6E2bLkygvZgHkv173PdMDefmrc=", "homepage": "https://registry.terraform.io/providers/rundeck/rundeck", "owner": "rundeck", "repo": "terraform-provider-rundeck", - "rev": "v0.5.1", + "rev": "v0.5.2", "spdx": "MPL-2.0", "vendorHash": null }, From 98bfb9030a7782d9043b518422b02b2725a56c74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 22:17:19 +0000 Subject: [PATCH 075/115] python3Packages.pyemvue: 0.18.8 -> 0.18.9 --- pkgs/development/python-modules/pyemvue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyemvue/default.nix b/pkgs/development/python-modules/pyemvue/default.nix index 450291c0676f..8ad9c9ed046e 100644 --- a/pkgs/development/python-modules/pyemvue/default.nix +++ b/pkgs/development/python-modules/pyemvue/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "pyemvue"; - version = "0.18.8"; + version = "0.18.9"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-MTVc5bzYMegITeLc3WmP1ctfTXStuOns1IYIFtga/Rk="; + hash = "sha256-iHnNR6c/EdKZzqs4zQodfEZ/FMj1j0JRKjktyq/H0o0="; }; nativeBuildInputs = [ hatchling ]; From 0fb31f2fd3c5d522010040692c58b2beed078028 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 22:32:14 +0000 Subject: [PATCH 076/115] zoekt: 3.7.2-2-unstable-2025-05-21 -> 3.7.2-2-unstable-2025-06-04 --- pkgs/by-name/zo/zoekt/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix index ca2bd90b45ac..1f1acff8286e 100644 --- a/pkgs/by-name/zo/zoekt/package.nix +++ b/pkgs/by-name/zo/zoekt/package.nix @@ -8,16 +8,16 @@ buildGoModule { pname = "zoekt"; - version = "3.7.2-2-unstable-2025-05-21"; + version = "3.7.2-2-unstable-2025-06-04"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "zoekt"; - rev = "91259775f43ca589d8a846e3add881fe59818f82"; - hash = "sha256-r+AQbW8VEh+3/NVSgroX0VT7gFLaEMSZpS90+Wp+MnU="; + rev = "fd39c591438fbce188ed9dd0211aefc56bc7322a"; + hash = "sha256-gmpa3Jxh1UPpyWEiAkcTaNEXODVaKEn1b82mDFD/I68="; }; - vendorHash = "sha256-B45Q9G+p/idqqz45lLQQuDGLwAzhKuo9Ev+cISGbKUo="; + vendorHash = "sha256-1WfQbvT5pKZRfs2DWv6+jBpHKGpcxhYAnc+NXvMT6WE="; nativeCheckInputs = [ gitMinimal From 55d51769127864236c2204c2c376b79dede2997e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 23:49:21 +0000 Subject: [PATCH 077/115] weaver: 0.15.1 -> 0.15.2 --- pkgs/by-name/we/weaver/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/weaver/package.nix b/pkgs/by-name/we/weaver/package.nix index 151fc1628729..a2e911271e06 100644 --- a/pkgs/by-name/we/weaver/package.nix +++ b/pkgs/by-name/we/weaver/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "weaver"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "weaver"; tag = "v${finalAttrs.version}"; - hash = "sha256-cEexfPtlbcLR+u5bfwLtDX7iT8ayelSTGdVXSRhKGkY="; + hash = "sha256-F7FLQ0EAJFll8Twbg11MQ7fqzzlOntqwqVG9+PjRfQM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-b06bNgRYlsqk/evGubgtnBJM76mm5rQP6VuiHOxyCuw="; + cargoHash = "sha256-alk9TIBN69JvrygcODkuDWQB8qvo7pF9HKoMJsNpaY4="; checkFlags = [ # Skip tests requiring network From f3072b1ae1f2958f925e5ee2bd3e90e568443938 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jun 2025 00:27:35 +0000 Subject: [PATCH 078/115] python3Packages.databricks-sdk: 0.55.0 -> 0.56.0 --- pkgs/development/python-modules/databricks-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix index b8647c483e2e..0dc60cdf4230 100644 --- a/pkgs/development/python-modules/databricks-sdk/default.nix +++ b/pkgs/development/python-modules/databricks-sdk/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "databricks-sdk"; - version = "0.55.0"; + version = "0.56.0"; pyproject = true; src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sdk-py"; tag = "v${version}"; - hash = "sha256-H/LtuqVRW3Ii/z/AU4d/PLxywG41G4aZH3xz+nOM0FY="; + hash = "sha256-xMwjyXv/X0rAc2kXk9OyTrYrTJEk3irpDPZ8z6LLSoM="; }; build-system = [ From e4d692b79d35f93d843ecace53e69c735ae96a4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jun 2025 00:31:46 +0000 Subject: [PATCH 079/115] nfpm: 2.42.1 -> 2.43.0 --- pkgs/by-name/nf/nfpm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nf/nfpm/package.nix b/pkgs/by-name/nf/nfpm/package.nix index cab71f76e9a7..584452324e11 100644 --- a/pkgs/by-name/nf/nfpm/package.nix +++ b/pkgs/by-name/nf/nfpm/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.42.1"; + version = "2.43.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = "nfpm"; rev = "v${version}"; - hash = "sha256-uHtrxBlSlVBmpVqE645nRNQ3mL07Uj9YrmG/jAfuyyg="; + hash = "sha256-HbGO4+wFp2mRBOKNxbnZ9sHUJS25ZQ4RaC1Eaw0kfrg="; }; - vendorHash = "sha256-pxOxiYYvzIAmXo4rRLpngG4ILUhc1f1DJqwNxXlCXtM="; + vendorHash = "sha256-BN+ruaajQuvFa/tECI9s0no6+EFR7BYoa1+Z/YI1PbY="; ldflags = [ "-s" From 2836a07ca0b086cbc13851c4f9f0c6b21cf63341 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jun 2025 01:31:20 +0000 Subject: [PATCH 080/115] cdncheck: 1.1.21 -> 1.1.22 --- pkgs/by-name/cd/cdncheck/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix index ad40764e26d7..7934b8527312 100644 --- a/pkgs/by-name/cd/cdncheck/package.nix +++ b/pkgs/by-name/cd/cdncheck/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cdncheck"; - version = "1.1.21"; + version = "1.1.22"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cdncheck"; tag = "v${version}"; - hash = "sha256-GTYgo5rx4PrWLytqdH3LrasgyEAr1FuPyI26tGRaV0A="; + hash = "sha256-EjmQBNYfRl6R01Q3khMqsoYWZM9gG5eiZyJzJrs5ZjQ="; }; vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4="; From a0e04f010d42b589169e983302605b4217ec6094 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jun 2025 02:57:32 +0000 Subject: [PATCH 081/115] fastp: 0.24.2 -> 0.26.0 --- pkgs/by-name/fa/fastp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fastp/package.nix b/pkgs/by-name/fa/fastp/package.nix index 0a2290d2f629..0b8e61a53f26 100644 --- a/pkgs/by-name/fa/fastp/package.nix +++ b/pkgs/by-name/fa/fastp/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "fastp"; - version = "0.24.2"; + version = "0.26.0"; src = fetchFromGitHub { owner = "OpenGene"; repo = "fastp"; rev = "v${version}"; - sha256 = "sha256-8AJ6wgqbCqH/f3flgdVYUb5u0C5/CQl6MJe7HmZrp60="; + sha256 = "sha256-DrvY2FqTlQU3mJkBp/gM+GHlBlumfYRZItpphaF1xfs="; }; buildInputs = [ From 9dc40ca452316f05616d5a9000306106b9406c4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jun 2025 03:21:29 +0000 Subject: [PATCH 082/115] cargo-shear: 1.3.0 -> 1.3.1 --- pkgs/by-name/ca/cargo-shear/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index e10c1d9c5237..77c3fad0a552 100644 --- a/pkgs/by-name/ca/cargo-shear/package.nix +++ b/pkgs/by-name/ca/cargo-shear/package.nix @@ -6,7 +6,7 @@ cargo-shear, }: let - version = "1.3.0"; + version = "1.3.1"; in rustPlatform.buildRustPackage { pname = "cargo-shear"; @@ -16,11 +16,11 @@ rustPlatform.buildRustPackage { owner = "Boshen"; repo = "cargo-shear"; rev = "v${version}"; - hash = "sha256-OOjN6JI5RWo2J2awX3ts4wlVptQ1mhQEk8acNOVjFz0="; + hash = "sha256-y50nYTwUobNyb+uTln9K8of3L9a7G1D/CporgX3obn0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ha/soHq6lEZUQ/gfk4zQkRBGN3S6npJ2CHI2oyjDsXA="; + cargoHash = "sha256-dmpYnYUPKhkB72J/TO0u8y8dDaGrOwYSHghSu/SCUDc="; # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23 SHEAR_VERSION = version; From 16e86693aa1e130ed6dab79b5b25625f1006ae2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jun 2025 04:52:28 +0000 Subject: [PATCH 083/115] python3Packages.json-repair: 0.46.0 -> 0.46.2 --- pkgs/development/python-modules/json-repair/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/json-repair/default.nix b/pkgs/development/python-modules/json-repair/default.nix index 04d252c45e4b..5e1d22a29326 100644 --- a/pkgs/development/python-modules/json-repair/default.nix +++ b/pkgs/development/python-modules/json-repair/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "json-repair"; - version = "0.46.0"; + version = "0.46.2"; pyproject = true; src = fetchFromGitHub { owner = "mangiucugna"; repo = "json_repair"; tag = "v${version}"; - hash = "sha256-MfjWZYDYiFBTy0Tsm0OKY/89ziSTXNB5m99VkpS0Mco="; + hash = "sha256-Xj3gLduN5aiy/XJ8jOaJEp4o3iX+PTD6eLBGHoHQ5HM="; }; build-system = [ setuptools ]; From 640cb2203bf5e5ae784de5e427111e13a7306955 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jun 2025 05:39:33 +0000 Subject: [PATCH 084/115] inputplumber: 0.58.2 -> 0.58.5 --- pkgs/by-name/in/inputplumber/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix index 1dde42f002b6..5fee0006f8c5 100644 --- a/pkgs/by-name/in/inputplumber/package.nix +++ b/pkgs/by-name/in/inputplumber/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "inputplumber"; - version = "0.58.2"; + version = "0.58.5"; src = fetchFromGitHub { owner = "ShadowBlip"; repo = "InputPlumber"; tag = "v${version}"; - hash = "sha256-G4RJansuv7U69l1QIfGp/cQqFtjY8BCMBcA9fiPMhHk="; + hash = "sha256-Ozd/MfPoEXodPnjNkmBGGJQCKFSuKr/SrnncDWbhiY8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ftIUollVuiL0a76D7WMvW5bzNUdTMebRVbWQYu2LfIA="; + cargoHash = "sha256-dzPBEIGOOplG+td78Ujm66kPFGAHgI1d68IU4KTQtxE="; nativeBuildInputs = [ pkg-config From f0b3f7f50abf0e73057ff606f08de6cc4bc746ff Mon Sep 17 00:00:00 2001 From: ash Date: Sun, 8 Jun 2025 09:25:44 +0100 Subject: [PATCH 085/115] keymapp: re-add missing desktop entry --- pkgs/by-name/ke/keymapp/linux.nix | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ke/keymapp/linux.nix b/pkgs/by-name/ke/keymapp/linux.nix index 07f93bb5075a..4f8f00cb8894 100644 --- a/pkgs/by-name/ke/keymapp/linux.nix +++ b/pkgs/by-name/ke/keymapp/linux.nix @@ -48,15 +48,17 @@ stdenv.mkDerivation { gappsWrapperArgs+=(--set-default '__NV_PRIME_RENDER_OFFLOAD' 1) ''; - desktopItem = makeDesktopItem { - name = "keymapp"; - icon = "keymapp"; - desktopName = "Keymapp"; - categories = [ - "Settings" - "HardwareSettings" - ]; - type = "Application"; - exec = "keymapp"; - }; + desktopItems = [ + (makeDesktopItem { + name = "keymapp"; + icon = "keymapp"; + desktopName = "Keymapp"; + categories = [ + "Settings" + "HardwareSettings" + ]; + type = "Application"; + exec = "keymapp"; + }) + ]; } From b7f5fce1cacaee5fe9636d45c18c35a1d990787c Mon Sep 17 00:00:00 2001 From: oddlama Date: Sat, 7 Jun 2025 11:05:59 +0200 Subject: [PATCH 086/115] kanidm-provision: 1.2.1 -> 1.3.0 --- pkgs/by-name/ka/kanidm-provision/package.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ka/kanidm-provision/package.nix b/pkgs/by-name/ka/kanidm-provision/package.nix index a96a6d5add71..318bbb09c0ab 100644 --- a/pkgs/by-name/ka/kanidm-provision/package.nix +++ b/pkgs/by-name/ka/kanidm-provision/package.nix @@ -2,7 +2,6 @@ lib, rustPlatform, fetchFromGitHub, - yq, versionCheckHook, nix-update-script, nixosTests, @@ -10,25 +9,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "kanidm-provision"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "oddlama"; repo = "kanidm-provision"; tag = "v${finalAttrs.version}"; - hash = "sha256-kwxGrLz59Zk8PSsfQzPUeA/xWQZrV1NWlS5/yuqfIyI="; + hash = "sha256-m3bF4wFPVRc2E+E/pZc3js9T4rYbTejo/FFpysytWKw="; }; - postPatch = '' - tomlq -ti '.package.version = "${finalAttrs.version}"' Cargo.toml - ''; - useFetchCargoVendor = true; - cargoHash = "sha256-uo/TGyfNChq/t6Dah0HhXhAwktyQk0V/wewezZuftNk="; - - nativeBuildInputs = [ - yq # for `tomlq` - ]; + cargoHash = "sha256-dPTrIc/hTbMlFDXYMk/dTjqaNECazldfW43egDOwyLM="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; From 5f833b1008e4d101e985648dd0b558e2ad46b010 Mon Sep 17 00:00:00 2001 From: oddlama Date: Sat, 7 Jun 2025 11:34:48 +0200 Subject: [PATCH 087/115] nixos/kanidm: add option and tests for imperative group management --- nixos/modules/services/security/kanidm.nix | 11 +++++++++++ nixos/tests/kanidm-provisioning.nix | 19 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix index 002144888ecf..14927f439ca5 100644 --- a/nixos/modules/services/security/kanidm.nix +++ b/nixos/modules/services/security/kanidm.nix @@ -460,6 +460,17 @@ in apply = unique; default = [ ]; }; + + overwriteMembers = mkOption { + description = '' + Whether the member list should be overwritten each time (true) or appended + (false). Append mode allows interactive group management in addition to the + declared members. Also, future member removals cannot be reflected + automatically in append mode. + ''; + type = types.bool; + default = true; + }; }; config.members = concatLists ( flip mapAttrsToList cfg.provision.persons ( diff --git a/nixos/tests/kanidm-provisioning.nix b/nixos/tests/kanidm-provisioning.nix index f38e0770388d..b04fb4d65e4a 100644 --- a/nixos/tests/kanidm-provisioning.nix +++ b/nixos/tests/kanidm-provisioning.nix @@ -73,6 +73,10 @@ in }; groups.testgroup1 = { }; + groups.imperative = { + overwriteMembers = false; + members = [ "testuser1" ]; + }; persons.testuser1 = { displayName = "Test User"; @@ -133,6 +137,11 @@ in }; groups.testgroup1 = { }; + groups.imperative = { + overwriteMembers = false; + # Will be retained: + # members = [ "testuser1" ]; + }; persons.testuser1 = { displayName = "Test User (changed)"; @@ -351,6 +360,10 @@ in out = provision.succeed("kanidm group get testgroup1") assert_contains(out, "name: testgroup1") + out = provision.succeed("kanidm group get imperative") + assert_contains(out, "name: imperative") + assert_contains(out, "member: testuser1") + out = provision.succeed("kanidm group get supergroup1") assert_contains(out, "name: supergroup1") assert_contains(out, "member: testgroup1") @@ -361,6 +374,7 @@ in assert_contains(out, "legalname: Jane Doe") assert_contains(out, "mail: jane.doe@example.com") assert_contains(out, "memberof: testgroup1") + assert_contains(out, "memberof: imperative") assert_contains(out, "memberof: service1-access") out = provision.succeed("kanidm person get testuser2") @@ -405,6 +419,10 @@ in out = provision.succeed("kanidm group get testgroup1") assert_contains(out, "name: testgroup1") + out = provision.succeed("kanidm group get imperative") + assert_contains(out, "name: imperative") + assert_contains(out, "member: testuser1") + out = provision.succeed("kanidm group get supergroup1") assert_contains(out, "name: supergroup1") assert_lacks(out, "member: testgroup1") @@ -416,6 +434,7 @@ in assert_contains(out, "mail: jane.doe@example.com") assert_contains(out, "mail: second.doe@example.com") assert_lacks(out, "memberof: testgroup1") + assert_contains(out, "memberof: imperative") assert_contains(out, "memberof: service1-access") out = provision.succeed("kanidm person get testuser2") From 6e84d13d28421f751ef1717f390ec35efac7c8b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jun 2025 10:05:12 +0000 Subject: [PATCH 088/115] nu_scripts: 0-unstable-2025-05-22 -> 0-unstable-2025-06-05 --- pkgs/by-name/nu/nu_scripts/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix index 78b6e4c0b9e4..6ff0f5a3bc72 100644 --- a/pkgs/by-name/nu/nu_scripts/package.nix +++ b/pkgs/by-name/nu/nu_scripts/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "nu_scripts"; - version = "0-unstable-2025-05-22"; + version = "0-unstable-2025-06-05"; src = fetchFromGitHub { owner = "nushell"; repo = "nu_scripts"; - rev = "765555beddc3c81555e6b70abb2542c37a1c0ad6"; - hash = "sha256-/LoeL4BILPSOv3jnURcuuQhuRLdE0amBGnEOTB+LLgI="; + rev = "6fe7713322d95be89677389f812eceab6d4b89e2"; + hash = "sha256-Dq5KwKpnpX9YJIj7FM5fNaeMNdk/BHji2CesIE6Ndps="; }; installPhase = '' From b33e2df22a19d9b6e4bfbc29dee27e1a21137702 Mon Sep 17 00:00:00 2001 From: Louis Dalibard Date: Tue, 3 Jun 2025 22:09:07 +0200 Subject: [PATCH 089/115] packet: init at 0.3.4 Co-authored-by: Aleksana --- pkgs/by-name/pa/packet/package.nix | 73 ++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 pkgs/by-name/pa/packet/package.nix diff --git a/pkgs/by-name/pa/packet/package.nix b/pkgs/by-name/pa/packet/package.nix new file mode 100644 index 000000000000..b25c00c8670e --- /dev/null +++ b/pkgs/by-name/pa/packet/package.nix @@ -0,0 +1,73 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cargo, + meson, + ninja, + pkg-config, + protobuf, + rustPlatform, + rustc, + wrapGAppsHook4, + cairo, + dbus, + gdk-pixbuf, + glib, + gtk4, + libadwaita, + pango, + blueprint-compiler, + desktop-file-utils, + appstream, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "packet"; + version = "0.3.4"; + + src = fetchFromGitHub { + owner = "nozwock"; + repo = "packet"; + tag = finalAttrs.version; + hash = "sha256-s3R/RDfQAQR6Jdehco5TD+2GpG4y9sEl0moWMxv3PZE="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-0Cbw5bSOK1bTq8ozZlRpZOelfak6N2vZOQPU4vsnepk="; + }; + + nativeBuildInputs = [ + cargo + meson + ninja + pkg-config + protobuf + rustPlatform.cargoSetupHook + rustc + wrapGAppsHook4 + blueprint-compiler + desktop-file-utils + glib + gtk4 + appstream + ]; + + buildInputs = [ + cairo + dbus + gdk-pixbuf + libadwaita + pango + ]; + + meta = { + description = "Quick Share client for Linux"; + homepage = "https://github.com/nozwock/packet"; + changelog = "https://github.com/nozwock/packet/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ ontake ]; + mainProgram = "packet"; + platforms = lib.platforms.linux; + }; +}) From 29aa61192b92e12f60230170dd34c422406d1523 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jun 2025 11:22:34 +0000 Subject: [PATCH 090/115] hcp: 0.9.1 -> 0.10.0 --- pkgs/by-name/hc/hcp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hc/hcp/package.nix b/pkgs/by-name/hc/hcp/package.nix index 5fd6b98162c2..1bd1861b0502 100644 --- a/pkgs/by-name/hc/hcp/package.nix +++ b/pkgs/by-name/hc/hcp/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "hcp"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "hcp"; tag = "v${version}"; - hash = "sha256-53UTxf83jc2tyWJe+BHSitwpQVc6Ecq0wsf8avGPJcM="; + hash = "sha256-uiPNHrhMwYLB7ANgcJwfupvya/pUUQICm48/Vac8s40="; }; vendorHash = "sha256-Tq7Lu9rZCLpy7CiZQey5/y1hZPEvdSsy1BgEFWNVeAk="; From 113b5ea334d76f72548e0c0a578e41d749f5dd20 Mon Sep 17 00:00:00 2001 From: Pokey <79169880+Pokeylooted@users.noreply.github.com> Date: Tue, 27 May 2025 11:12:17 +0000 Subject: [PATCH 091/115] maintainers: add Pokeylooted Signed-off-by: Sefa Eyeoglu --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1fe6c64c6000..43f03d53c4a2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -19732,6 +19732,12 @@ githubId = 38314551; name = "Peter Okelmann"; }; + Pokeylooted = { + email = "pokeyrandomgaming@gmail.com"; + github = "Pokeylooted"; + githubId = 79169880; + name = "Dani Barton"; + }; pokon548 = { email = "nix@bukn.uk"; github = "pokon548"; From 442d5ac1f026add7a791905386ced53e62572013 Mon Sep 17 00:00:00 2001 From: Pokey <79169880+Pokeylooted@users.noreply.github.com> Date: Sat, 10 May 2025 18:59:03 -0400 Subject: [PATCH 092/115] sbctl: 0.16 -> 0.17, adoption - Updated version to 0.17 - Fixed `hash` and `vendorHash` - Removed nested `with` usage - Set `mainProgram` - Minor formatting cleanup Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/sb/sbctl/package.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/sb/sbctl/package.nix b/pkgs/by-name/sb/sbctl/package.nix index a9b33ea9f479..8f971ca08294 100644 --- a/pkgs/by-name/sb/sbctl/package.nix +++ b/pkgs/by-name/sb/sbctl/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sbctl"; - version = "0.16"; + version = "0.17"; src = fetchFromGitHub { owner = "Foxboron"; repo = "sbctl"; tag = version; - hash = "sha256-BLSvjo6GCqpECJPJtQ6C2zEz1p03uyvxTYa+DoxZ78s="; + hash = "sha256-7dCaWemkus2GHxILBEx5YvzdAmv89JfcPbqZZ6QwriI"; }; - vendorHash = "sha256-srfZ+TD93szabegwtzLTjB+uo8aj8mB4ecQ9m8er00A="; + vendorHash = "sha256-gpHEJIbLnB0OiYB00rHK6OwrnHTHCj/tTVlUzuFjFKY="; ldflags = [ "-s" @@ -57,17 +57,18 @@ buildGoModule rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Secure Boot key manager"; mainProgram = "sbctl"; homepage = "https://github.com/Foxboron/sbctl"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + Pokeylooted raitobezarius Scrumplex ]; - # go-uefi do not support darwin at the moment: + # go-uefi does not support darwin at the moment: # see upstream on https://github.com/Foxboron/go-uefi/issues/13 - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } From e225c35b6d9442b4ffb60c05a5cc64c8cbf12680 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jun 2025 11:56:49 +0000 Subject: [PATCH 093/115] aliyun-cli: 3.0.278 -> 3.0.282 --- pkgs/by-name/al/aliyun-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix index 912562c174b4..462d2953d73d 100644 --- a/pkgs/by-name/al/aliyun-cli/package.nix +++ b/pkgs/by-name/al/aliyun-cli/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.278"; + version = "3.0.282"; src = fetchFromGitHub { owner = "aliyun"; repo = "aliyun-cli"; tag = "v${version}"; - hash = "sha256-SFoTeFKPUlP0clAP4gkPiNNVjqetJ8syNJDhGhNs6vo="; + hash = "sha256-EjswkbQVwFx6Z3HeHcB5A7xtjjllRGWLuVFfKvrURDg="; fetchSubmodules = true; }; From 89ec07b4b7e172d2e23fc9b1c6fca3ff3ca91d7d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 Jun 2025 14:05:37 +0200 Subject: [PATCH 094/115] gitleaks: 8.27.0 -> 8.27.1 Diff: https://github.com/zricethezav/gitleaks/compare/refs/tags/v8.27.0...refs/tags/v8.27.1 Changelog: https://github.com/zricethezav/gitleaks/releases/tag/v8.27.1 --- pkgs/by-name/gi/gitleaks/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/gitleaks/package.nix b/pkgs/by-name/gi/gitleaks/package.nix index a533cecbe514..76cf511b8a10 100644 --- a/pkgs/by-name/gi/gitleaks/package.nix +++ b/pkgs/by-name/gi/gitleaks/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.27.0"; + version = "8.27.1"; src = fetchFromGitHub { owner = "zricethezav"; repo = "gitleaks"; tag = "v${version}"; - hash = "sha256-62Tcj5NiEk4uaGpiallCjDzpkFbuTazfMiemEe+ATLg="; + hash = "sha256-Wsd/jyM16Ztkj4vNnui1qZE4v2ZBffdOVHJG4S+YLXU="; }; vendorHash = "sha256-vd39TbooEdmYa6QZGEnYOmYU9p+9mV+SrLKVY+h/PEM="; From 3ca82e776cf843e2fd1ddfb3d0bb5b3d41133bdc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jun 2025 12:07:35 +0000 Subject: [PATCH 095/115] python3Packages.qpsolvers: 4.7.0 -> 4.7.1 --- pkgs/development/python-modules/qpsolvers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix index f8e3cf41ad78..8e89b41c5fcc 100644 --- a/pkgs/development/python-modules/qpsolvers/default.nix +++ b/pkgs/development/python-modules/qpsolvers/default.nix @@ -23,14 +23,14 @@ }: buildPythonPackage rec { pname = "qpsolvers"; - version = "4.7.0"; + version = "4.7.1"; pyproject = true; src = fetchFromGitHub { owner = "qpsolvers"; repo = "qpsolvers"; tag = "v${version}"; - hash = "sha256-rHasR2myJjz4DoNWo2wvH11Mxxk/fZ/z9ZdglRcIPX0="; + hash = "sha256-sGnr1my1/1xA+pVX1SLsj8WtNViJ/nKRwN6Kl0HsJV0="; }; build-system = [ flit-core ]; From f07fa971de954dd6afa3811987fa54d0a20c93a8 Mon Sep 17 00:00:00 2001 From: DashieTM Date: Sun, 8 Jun 2025 14:07:04 +0200 Subject: [PATCH 096/115] vimPlugins.live-share-nvim: init at 2025-05-03 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 3164dbd7ec32..711661025f0d 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -7290,6 +7290,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + live-share-nvim = buildVimPlugin { + pname = "live-share.nvim"; + version = "2025-05-03"; + src = fetchFromGitHub { + owner = "azratul"; + repo = "live-share.nvim"; + rev = "11edb945131752c534fc903b7af2abfd6cf7edc6"; + sha256 = "11aiy4ki2gd67zfvf8bn3c0vghwmk8i87ylx3h1v0kvdjbq3bxww"; + }; + meta.homepage = "https://github.com/azratul/live-share.nvim/"; + meta.hydraPlatforms = [ ]; + }; + llama-vim = buildVimPlugin { pname = "llama.vim"; version = "2025-05-22"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index a6cb9e43dd7b..7a40df893af5 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -559,6 +559,7 @@ https://github.com/ldelossa/litee-filetree.nvim/,, https://github.com/ldelossa/litee-symboltree.nvim/,, https://github.com/ldelossa/litee.nvim/,, https://github.com/smjonas/live-command.nvim/,HEAD, +https://github.com/azratul/live-share.nvim/,HEAD, https://github.com/ggml-org/llama.vim/,HEAD, https://github.com/huggingface/llm.nvim/,HEAD, https://github.com/folke/lsp-colors.nvim/,, From 36530d5785df2d618a726bea5ebe07bcdfb07351 Mon Sep 17 00:00:00 2001 From: DashieTM Date: Sun, 8 Jun 2025 14:26:10 +0200 Subject: [PATCH 097/115] vimPlugins.debugmaster-nvim: init at 2025-05-26 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 18 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 3164dbd7ec32..b76f8654b4a5 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -3807,6 +3807,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + debugmaster-nvim = buildVimPlugin { + pname = "debugmaster.nvim"; + version = "2025-05-26"; + src = fetchFromGitHub { + owner = "miroshQa"; + repo = "debugmaster.nvim"; + rev = "aeae4c324be259856a3e9e436db89875421b78ca"; + sha256 = "1b919qrljmrczi89cn276rx5yib63yhnr3wscbypckda2d62bh5a"; + }; + meta.homepage = "https://github.com/miroshQa/debugmaster.nvim/"; + meta.hydraPlatforms = [ ]; + }; + debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; version = "2025-05-28"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 636a43b767d7..2035c0ac0d44 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -976,6 +976,10 @@ in dependencies = [ self.denops-vim ]; }; + debugmaster-nvim = super.debugmaster-nvim.overrideAttrs { + dependencies = [ self.nvim-dap ]; + }; + defx-nvim = super.defx-nvim.overrideAttrs { dependencies = [ self.nvim-yarp ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index a6cb9e43dd7b..6581ade9fa5d 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -291,6 +291,7 @@ https://github.com/Shougo/ddc-source-lsp/,HEAD, https://github.com/Shougo/ddc-ui-native/,HEAD, https://github.com/Shougo/ddc-ui-pum/,HEAD, https://github.com/Shougo/ddc.vim/,HEAD, +https://github.com/miroshQa/debugmaster.nvim/,HEAD, https://github.com/andrewferrier/debugprint.nvim/,HEAD, https://github.com/Verf/deepwhite.nvim/,, https://github.com/kristijanhusak/defx-git/,, From 38839a0aba3250c63e8a392ca9c34c23494da9a4 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 7 Jun 2025 23:50:27 +0400 Subject: [PATCH 098/115] mapnik: drop cmake-harfbuzz.patch --- pkgs/by-name/ma/mapnik/cmake-harfbuzz.patch | 26 --------------------- pkgs/by-name/ma/mapnik/package.nix | 8 ++----- 2 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 pkgs/by-name/ma/mapnik/cmake-harfbuzz.patch diff --git a/pkgs/by-name/ma/mapnik/cmake-harfbuzz.patch b/pkgs/by-name/ma/mapnik/cmake-harfbuzz.patch deleted file mode 100644 index aa08f351aa69..000000000000 --- a/pkgs/by-name/ma/mapnik/cmake-harfbuzz.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ffb86d4ac..1775b986f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -177,19 +177,8 @@ endif() - - mapnik_find_package(Freetype REQUIRED) - --# try to find harfbuzz with the native configuration and fallback to our "own" FindHarfBuzz --mapnik_find_package(harfbuzz CONFIG QUIET) --if(harfbuzz_FOUND) -- message(STATUS "Found harfbuzz native cmake") -- list(APPEND MAPNIK_OPTIONAL_LIBS harfbuzz::harfbuzz) --else() -- # Use pkg-config when harfbuzz is not found. -- # It might be possible that in future version harfbuzz could only be found via pkg-config. -- # harfbuzz related discussion: https://github.com/harfbuzz/harfbuzz/issues/2653 -- message(STATUS "harfbuzz not found via cmake. Searching via pkg-config...") -- mapnik_pkg_check_modules(harfbuzz REQUIRED IMPORTED_TARGET harfbuzz>=${HARFBUZZ_MIN_VERSION}) -- list(APPEND MAPNIK_OPTIONAL_LIBS PkgConfig::harfbuzz) --endif() -+pkg_check_modules(harfbuzz REQUIRED IMPORTED_TARGET harfbuzz) -+list(APPEND MAPNIK_OPTIONAL_LIBS PkgConfig::harfbuzz) - - if(USE_EXTERNAL_MAPBOX_GEOMETRY) - # this is used to provide a way to specify include dirs with CACHE VARIABLES diff --git a/pkgs/by-name/ma/mapnik/package.nix b/pkgs/by-name/ma/mapnik/package.nix index 79a043b36e98..9410c72ebad3 100644 --- a/pkgs/by-name/ma/mapnik/package.nix +++ b/pkgs/by-name/ma/mapnik/package.nix @@ -55,12 +55,6 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" ]; patches = [ - # The lib/cmake/harfbuzz/harfbuzz-config.cmake file in harfbuzz.dev is faulty, - # as it provides the wrong libdir. The workaround is to just rely on - # pkg-config to locate harfbuzz shared object files. - # Upstream HarfBuzz wants to drop CMake support anyway. - # See discussion: https://github.com/mapnik/mapnik/issues/4265 - ./cmake-harfbuzz.patch # Account for full paths when generating libmapnik.pc ./export-pkg-config-full-paths.patch # Use 'sparsehash' package. @@ -99,6 +93,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_DEMO_CPP" false) ## Would require QT otherwise. (lib.cmakeBool "BUILD_DEMO_VIEWER" false) + # disable the find_package call and force pkg-config, see https://github.com/mapnik/mapnik/pull/4270 + (lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_harfbuzz" true) # Use 'protozero' package. (lib.cmakeBool "USE_EXTERNAL_MAPBOX_PROTOZERO" true) # macOS builds fail when using memory mapped file cache. From a652a057cd53aa5ae9fc8a3c293ae1587b31f3e2 Mon Sep 17 00:00:00 2001 From: DashieTM Date: Sun, 8 Jun 2025 14:54:05 +0200 Subject: [PATCH 099/115] vimPlugins.ng-nvim: init at 2025-04-21 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 3164dbd7ec32..5193041eebbf 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -9712,6 +9712,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + ng-nvim = buildVimPlugin { + pname = "ng.nvim"; + version = "2025-04-21"; + src = fetchFromGitHub { + owner = "joeveiga"; + repo = "ng.nvim"; + rev = "28b87c46fe813c8859d607f4a31b7b5fbdbd75d3"; + sha256 = "0i6y9p2cvbka97qnlwpl0kmfbl7xf98sx0khnjd5nappi7kb9zi8"; + }; + meta.homepage = "https://github.com/joeveiga/ng.nvim/"; + meta.hydraPlatforms = [ ]; + }; + nginx-vim = buildVimPlugin { pname = "nginx.vim"; version = "2023-11-26"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index a6cb9e43dd7b..6f53f2e06e0a 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -745,6 +745,7 @@ https://github.com/prichrd/netrw.nvim/,HEAD, https://github.com/oberblastmeister/neuron.nvim/,, https://github.com/fiatjaf/neuron.vim/,, https://github.com/Olical/nfnl/,main, +https://github.com/joeveiga/ng.nvim/,HEAD, https://github.com/chr4/nginx.vim/,, https://github.com/oxfist/night-owl.nvim/,, https://github.com/bluz71/vim-nightfly-colors/,,nightfly From dad88a410eedb6a97aef641ad177d16b0ccd3ab6 Mon Sep 17 00:00:00 2001 From: DashieTM Date: Sun, 8 Jun 2025 15:03:19 +0200 Subject: [PATCH 100/115] vimPlugins.multicursor-nvim: init at 2025-05-29 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 3164dbd7ec32..b60d69178502 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -8617,6 +8617,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + multicursor-nvim = buildVimPlugin { + pname = "multicursor.nvim"; + version = "2025-05-29"; + src = fetchFromGitHub { + owner = "jake-stewart"; + repo = "multicursor.nvim"; + rev = "6fba38bccf45cfb681f4ff6098f886213f299a34"; + sha256 = "1d3lsxg9kmn4622nacn2ycg56ca3skazjaar0smc61v1asa8jhrm"; + }; + meta.homepage = "https://github.com/jake-stewart/multicursor.nvim/"; + meta.hydraPlatforms = [ ]; + }; + multicursors-nvim = buildVimPlugin { pname = "multicursors.nvim"; version = "2025-02-26"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index a6cb9e43dd7b..25cc44e83db9 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -661,6 +661,7 @@ https://github.com/jackplus-xyz/monaspace.nvim/,HEAD, https://github.com/loctvl842/monokai-pro.nvim/,HEAD, https://github.com/leafo/moonscript-vim/,HEAD, https://github.com/yegappan/mru/,, +https://github.com/jake-stewart/multicursor.nvim/,HEAD, https://github.com/smoka7/multicursors.nvim/,HEAD, https://github.com/AckslD/muren.nvim/,HEAD, https://github.com/jbyuki/nabla.nvim/,HEAD, From a77ca15ec68056e8205bbb693f0767529585aa6a Mon Sep 17 00:00:00 2001 From: DashieTM Date: Sun, 8 Jun 2025 15:14:47 +0200 Subject: [PATCH 101/115] vimPlugins.patterns-nvim: init at 2025-05-12 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 3164dbd7ec32..7c3f92907aef 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -12066,6 +12066,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + patterns-nvim = buildVimPlugin { + pname = "patterns.nvim"; + version = "2025-05-12"; + src = fetchFromGitHub { + owner = "OXY2DEV"; + repo = "patterns.nvim"; + rev = "f45abad8b6e8606279c933017d68dcf1d0dc53d4"; + sha256 = "1pxkiz759c60fds2cbc089zwk9yqxymzva81dxkm20iprc988cc7"; + }; + meta.homepage = "https://github.com/OXY2DEV/patterns.nvim/"; + meta.hydraPlatforms = [ ]; + }; + pckr-nvim = buildVimPlugin { pname = "pckr.nvim"; version = "2025-05-09"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index a6cb9e43dd7b..4bfde8a09900 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -926,6 +926,7 @@ https://github.com/NLKNguyen/papercolor-theme/,, https://github.com/pappasam/papercolor-theme-slim/,HEAD, https://github.com/dundalek/parpar.nvim/,, https://github.com/frankroeder/parrot.nvim/,HEAD, +https://github.com/OXY2DEV/patterns.nvim/,HEAD, https://github.com/lewis6991/pckr.nvim/,HEAD, https://github.com/tmsvg/pear-tree/,, https://github.com/steelsojka/pears.nvim/,, From d8426086f32afd2b59fd3b0c0bdb9db87470bdb5 Mon Sep 17 00:00:00 2001 From: DashieTM Date: Sun, 8 Jun 2025 15:20:14 +0200 Subject: [PATCH 102/115] vimPlugins.endec-nvim: init at 2025-04-07 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 3164dbd7ec32..0c72fee61ebb 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -4643,6 +4643,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + endec-nvim = buildVimPlugin { + pname = "endec.nvim"; + version = "2025-04-07"; + src = fetchFromGitHub { + owner = "ovk"; + repo = "endec.nvim"; + rev = "3765f250064040725fa637e9a308253e1421b1fd"; + sha256 = "088fv7yag7phpwxrmcq82mgy1fin6zcsyb6cz853z22hsn4zb7z5"; + }; + meta.homepage = "https://github.com/ovk/endec.nvim/"; + meta.hydraPlatforms = [ ]; + }; + errormarker-vim = buildVimPlugin { pname = "errormarker.vim"; version = "2015-01-26"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index a6cb9e43dd7b..9cffbc9fa9ac 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -355,6 +355,7 @@ https://github.com/dmix/elvish.vim/,, https://github.com/embark-theme/vim/,,embark-vim https://github.com/mattn/emmet-vim/,, https://github.com/vim-scripts/emodeline/,, +https://github.com/ovk/endec.nvim/,HEAD, https://github.com/vim-scripts/errormarker.vim/,, https://github.com/hachy/eva01.vim/,, https://github.com/sainnhe/everforest/,, From c691e8174ae13ae383cc10797daa1a9b0ed6843c Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 8 Jun 2025 17:56:42 +0400 Subject: [PATCH 103/115] glaze: modernize --- pkgs/by-name/gl/glaze/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix index 1e35c5e57f62..ca125c5cf043 100644 --- a/pkgs/by-name/gl/glaze/package.nix +++ b/pkgs/by-name/gl/glaze/package.nix @@ -13,17 +13,17 @@ stdenv.mkDerivation (final: { src = fetchFromGitHub { owner = "stephenberry"; repo = "glaze"; - rev = "v${final.version}"; + tag = "v${final.version}"; hash = "sha256-AG6fnax9UZEhGtAUc8bgGijk8q7ge6lDTb0XjqL+kks="; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ (lib.cmakeBool "glaze_ENABLE_AVX2" enableAvx2) ]; - meta = with lib; { + meta = { description = "Extremely fast, in memory, JSON and interface library for modern C++"; - platforms = platforms.all; - maintainers = with maintainers; [ moni ]; - license = licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ moni ]; + license = lib.licenses.mit; }; }) From e95fcea8d878adaf56ccbc283970c3113b68ef68 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sun, 8 Jun 2025 16:23:17 +0200 Subject: [PATCH 104/115] noto-fonts-cjk-sans-static: init at Serif2.004 --- .../by-name/no/noto-fonts-cjk-sans/package.nix | 18 +++++++++++++----- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/no/noto-fonts-cjk-sans/package.nix b/pkgs/by-name/no/noto-fonts-cjk-sans/package.nix index 974d8a698fbd..10b39469d344 100644 --- a/pkgs/by-name/no/noto-fonts-cjk-sans/package.nix +++ b/pkgs/by-name/no/noto-fonts-cjk-sans/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, nixosTests, gitUpdater, + static ? false, }: stdenvNoCC.mkDerivation rec { @@ -14,13 +15,20 @@ stdenvNoCC.mkDerivation rec { owner = "notofonts"; repo = "noto-cjk"; rev = "Sans${version}"; - hash = "sha256-IgalJkiOAVjNxKaPAQWfb5hKeqclliR4qVXCq63FGWY="; - sparseCheckout = [ "Sans/Variable/OTC" ]; + hash = "sha256-i3ZKoSy2SVs46IViha+Sg8atH4n3ywgrunHPLtVT4Pk="; + sparseCheckout = [ + "Sans/OTC" + "Sans/Variable/OTC" + ]; }; - installPhase = '' - install -m444 -Dt $out/share/fonts/opentype/noto-cjk Sans/Variable/OTC/*.otf.ttc - ''; + installPhase = + let + font-path = if static then "Sans/OTC/*.ttc" else "Sans/Variable/OTC/*.otf.ttc"; + in + '' + install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${font-path} + ''; passthru.tests.noto-fonts = nixosTests.noto-fonts; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b07d1ab9e4f3..1dba152b606f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11725,6 +11725,10 @@ with pkgs; static = true; }; + noto-fonts-cjk-sans-static = callPackage ../by-name/no/noto-fonts-cjk-sans/package.nix { + static = true; + }; + noto-fonts-lgc-plus = callPackage ../by-name/no/noto-fonts/package.nix { suffix = "-lgc-plus"; variants = [ From 448e72ebf28850bf8911f0411fb946f50bc24560 Mon Sep 17 00:00:00 2001 From: Lin Xianyi Date: Sat, 7 Jun 2025 08:43:58 +0800 Subject: [PATCH 105/115] swww: 0.10.1 -> 0.10.2 Changelog: https://github.com/LGFae/swww/releases/tag/v0.10.2 Diff: https://github.com/LGFae/swww/compare/refs/tags/v0.10.1...refs/tags/v0.10.2 --- pkgs/by-name/sw/swww/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sw/swww/package.nix b/pkgs/by-name/sw/swww/package.nix index f45d9c276390..92c9e379d70d 100644 --- a/pkgs/by-name/sw/swww/package.nix +++ b/pkgs/by-name/sw/swww/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "swww"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "LGFae"; repo = "swww"; tag = "v${finalAttrs.version}"; - hash = "sha256-HEocjIsij9k4NjcmI8YRW6yzrYh+i3XN9YkRTr5fzDE="; + hash = "sha256-qvxG8UhO7MsS0lWVGfHUsBKevAa+VJe41NrcX1ZCJdU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-muWY99OtzG0AumbKpYoxNSjhXHYmkiwElVUdp2zE8a0="; + cargoHash = "sha256-Tiszc/COelBRolrrbKpNklk8IVppIhGmxspnTb20LAE="; buildInputs = [ lz4 From 35a22ca9e844036323675f2fb4df08d81df3a409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kry=C5=A1tof=20Baksa?= <62813600+Golbinex@users.noreply.github.com> Date: Fri, 6 Jun 2025 16:50:35 +0200 Subject: [PATCH 106/115] home-assistant-custom-components.ntfy: 1.2.0-pre.2 -> 1.2.0 https://github.com/hbrennhaeuser/homeassistant_integration_ntfy/releases/tag/v1.2.0 --- .../servers/home-assistant/custom-components/ntfy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/ntfy/package.nix b/pkgs/servers/home-assistant/custom-components/ntfy/package.nix index 20468ad516e8..cbe51a92e7d4 100644 --- a/pkgs/servers/home-assistant/custom-components/ntfy/package.nix +++ b/pkgs/servers/home-assistant/custom-components/ntfy/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "hbrennhaeuser"; domain = "ntfy"; - version = "1.2.0-pre.2"; + version = "1.2.0"; src = fetchFromGitHub { inherit owner; repo = "homeassistant_integration_ntfy"; rev = "v${version}"; - hash = "sha256-ydWZ4ApYQ9kyMA5A2OGXG323/7H3fa2XPiOAFBZNM30="; + hash = "sha256-cy4aHrUdFlMGQt9we0pA8TEGffQEGptZoaSKxwXD4kM="; }; dependencies = [ From 8d0e54a6a1dda22c2a84c4d3cb0401c78ba93d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kry=C5=A1tof=20Baksa?= <62813600+Golbinex@users.noreply.github.com> Date: Fri, 6 Jun 2025 16:51:10 +0200 Subject: [PATCH 107/115] home-assistant-custom-components.ntfy: Add baksa to maintainers --- .../home-assistant/custom-components/ntfy/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/custom-components/ntfy/package.nix b/pkgs/servers/home-assistant/custom-components/ntfy/package.nix index cbe51a92e7d4..689fc37c9417 100644 --- a/pkgs/servers/home-assistant/custom-components/ntfy/package.nix +++ b/pkgs/servers/home-assistant/custom-components/ntfy/package.nix @@ -24,7 +24,10 @@ buildHomeAssistantComponent rec { meta = with lib; { description = "Send notifications with ntfy.sh and selfhosted ntfy-servers"; homepage = "https://github.com/hbrennhaeuser/homeassistant_integration_ntfy"; - maintainers = with maintainers; [ koral ]; + maintainers = with maintainers; [ + koral + baksa + ]; license = licenses.gpl3; }; } From ae91003958555b8b73c17e6536a302ff492c9d04 Mon Sep 17 00:00:00 2001 From: emaryn Date: Sun, 8 Jun 2025 13:55:30 +0000 Subject: [PATCH 108/115] vscode: 1.100.2 -> 1.100.3 --- pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index c0e532c5f52e..d3b1618f0ad8 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -36,22 +36,22 @@ let sha256 = { - x86_64-linux = "1h55vjyv6vy4vyzi6lypnh4jrng8dgb7i6l9rq6k94lbl3mbnb2w"; - x86_64-darwin = "02c79ii2gpffc552aq0slpxfdp4ajf1cp7djhn7bap22wym53x8v"; - aarch64-linux = "1ixx31ar2hb25387520509p8lqi9a5if7c992hizvjwdvwfsvwx5"; - aarch64-darwin = "1ic6z47ci0wqq7sak0x9x0ywa0m7mgls2fm6m9fvd4xh1asa25ms"; - armv7l-linux = "1xn1nl7s88jsxwavm3m9w35518qn4886mqh6zfiwzj5dn3ib8425"; + x86_64-linux = "0kd4nb8b17j7ii5lhq4cih62pghb4j9gylgz9yqippxivzzkq6dd"; + x86_64-darwin = "1y96sp3lkm32fnhjak2js11m9qf8155gglp9g83ynv9d8sdy14ya"; + aarch64-linux = "162wac7s0l4pq6r6sh32lh69j90rna430z57ksb6g9w8spqzqnv4"; + aarch64-darwin = "1rqq131f1hs2z14ddh7sp6flwsgb58r8nw1ydbcclcmzi3vbdgr9"; + armv7l-linux = "06czqpzwlrx98bv2vmawjxxmzw9z6bcfxikp7nxhi8qp8nsjfvgy"; } .${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.100.2"; + version = "1.100.3"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "848b80aeb52026648a8ff9f7c45a9b0a80641e2e"; + rev = "258e40fedc6cb8edf399a463ce3a9d32e7e1f6f3"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -75,7 +75,7 @@ callPackage ./generic.nix rec { src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "0d5hbhk4f551yxrq28xyg3yj5xh72d9c1kd1cc9r9fq94l93pdvm"; + sha256 = "0bd04p4i5hkkccglw5x3vxf4vbq9hj83gdwfnaps5yskcqizhw77"; }; stdenv = stdenvNoCC; }; From e23215d5df03f4dbd678dc6aaf43c0f4fd5054e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jun 2025 13:30:33 +0000 Subject: [PATCH 109/115] mcphost: 0.7.1 -> 0.8.0 --- pkgs/by-name/mc/mcphost/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mc/mcphost/package.nix b/pkgs/by-name/mc/mcphost/package.nix index 90c81ab70dab..a4588efcfd3d 100644 --- a/pkgs/by-name/mc/mcphost/package.nix +++ b/pkgs/by-name/mc/mcphost/package.nix @@ -6,19 +6,19 @@ buildGoModule (finalAttrs: { pname = "mcphost"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "mark3labs"; repo = "mcphost"; tag = "v${finalAttrs.version}"; - hash = "sha256-4vKzrT/1pEupiW3IaQV6d4Y2QHKNBH8sCA4TP8qn+50="; + hash = "sha256-GnPabs21TS9SfpJBQ2g8AHJPoDnlxmZM/HKWcLPcwFg="; }; - vendorHash = "sha256-yD+83cuOIBFF91Zu4Xi2g+dsP4iUOTrjBOuetowLRQw="; + vendorHash = "sha256-0Q9Rn4K3wiZ2tQ2mP2Uh+Hjg1gAFE+AbJR/LA39C8Xs="; meta = { - description = "CLI host application that enables Large Language Models (LLMs) to interact with external tools through the Model Context Protocol (MCP"; + description = "CLI host application that enables Large Language Models (LLMs) to interact with external tools through the Model Context Protocol (MCP)"; homepage = "https://github.com/mark3labs/mcphost"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ drupol ]; From 5545f104e3f07e90ad83e2495973e69912ed72f6 Mon Sep 17 00:00:00 2001 From: MakiseKurisu Date: Sun, 8 Jun 2025 16:12:41 +0800 Subject: [PATCH 110/115] vscode-extensions.ms-vscode.remote-explorer: init at 0.5.0 --- .../editors/vscode/extensions/default.nix | 2 ++ .../ms-vscode.remote-explorer/default.nix | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/editors/vscode/extensions/ms-vscode.remote-explorer/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index df8374d59f36..9b75ef082621 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3538,6 +3538,8 @@ let }; }; + ms-vscode.remote-explorer = callPackage ./ms-vscode.remote-explorer { }; + ms-vscode.test-adapter-converter = buildVscodeMarketplaceExtension { mktplcRef = { name = "test-adapter-converter"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.remote-explorer/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.remote-explorer/default.nix new file mode 100644 index 000000000000..e01ef1fcfe8f --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.remote-explorer/default.nix @@ -0,0 +1,20 @@ +{ + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "remote-explorer"; + publisher = "ms-vscode"; + version = "0.5.0"; + sha256 = "sha256-BNsnetpddxv3Y9MjZERU5jOq1I2g6BNFF1rD7Agpmr8="; + }; + + meta = { + description = "Visual Studio Code extension to view remote machines for SSH and Tunnels"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.remote-explorer"; + homepage = "https://github.com/Microsoft/vscode-remote-release"; + license = lib.licenses.unfree; + }; +} From 3f134dec90f0f54101aa50e5c3551337d25c89b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jun 2025 17:31:54 +0000 Subject: [PATCH 111/115] mongodb-atlas-cli: 1.42.2 -> 1.43.2 --- pkgs/by-name/mo/mongodb-atlas-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/mongodb-atlas-cli/package.nix b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix index 2c00474a9587..2864e52b48ce 100644 --- a/pkgs/by-name/mo/mongodb-atlas-cli/package.nix +++ b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix @@ -10,15 +10,15 @@ buildGoModule rec { pname = "mongodb-atlas-cli"; - version = "1.42.2"; + version = "1.43.2"; - vendorHash = "sha256-oWn8vEwhcrGsytou+xIKOrM1kO0gIvU3X/aIWavhh2w="; + vendorHash = "sha256-Pem+3HH/bdf1SulsLo/5hsFYN8p7kQve0vXptUFnvsM="; src = fetchFromGitHub { owner = "mongodb"; repo = "mongodb-atlas-cli"; rev = "refs/tags/atlascli/v${version}"; - sha256 = "sha256-RJMcVOP94eFxbvYF20/X+wkf5+/DWSEQ4+dt/LxcDro="; + sha256 = "sha256-Xb/6kgqee38DqbLPLkel8NhXxdjq4UYX4E/y3xUW7og="; }; nativeBuildInputs = [ installShellFiles ]; From 5c371589e4bbd5b6c97a2bcf01b36dd3e76fc32d Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 30 May 2025 16:16:53 -0700 Subject: [PATCH 112/115] llvmPackages_20: 20.1.5 -> 20.1.6 --- .../compilers/llvm/common/llvm/default.nix | 12 +----------- pkgs/development/compilers/llvm/default.nix | 2 +- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index 42af5fa8be2b..519de80c8f8e 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -294,17 +294,7 @@ stdenv.mkDerivation ( ++ lib.optional (lib.versionAtLeast release_version "15") # Just like the `llvm-lit-cfg` patch, but for `polly`. - (getVersionFile "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch") - ++ - lib.optional (lib.versions.major release_version == "20") - # https://github.com/llvm/llvm-project/pull/139822 adds a commit which didn't get backported but is necessary for tests. - ( - fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/ff2e8f93f6090965e82d799af43f6dfef52baa66.patch"; - stripLen = 1; - hash = "sha256-CZBTZKzi4cYkZhgTB5oXIo1UdEAArg9I4vR/m0upSRk="; - } - ); + (getVersionFile "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch"); nativeBuildInputs = [ diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 1762da6b16a8..9fc862c71751 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -31,7 +31,7 @@ let "17.0.6".officialRelease.sha256 = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; - "20.1.5".officialRelease.sha256 = "sha256-WKfY+VvAsZEEc0xYgF6+MsXDXZz7haMU6bxqmUpaHuQ="; + "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y="; "21.0.0-git".gitRelease = { rev = "9e2684e4cfb0a7e30d5e49f812127d07cdda600d"; rev-version = "21.0.0-unstable-2025-06-06"; From d8b19009b69b0d3873b50f2fed9ebcd9bb1a5c48 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Jun 2025 14:56:37 +0200 Subject: [PATCH 113/115] python3Packages.meson-python: enable all tests I missed that it wasn't complaining about a missing git repo before, but want to create git repos instead. --- .../python-modules/meson-python/default.nix | 39 +------------------ 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix index c3bbdc6276e3..917cdd88e221 100644 --- a/pkgs/development/python-modules/meson-python/default.nix +++ b/pkgs/development/python-modules/meson-python/default.nix @@ -13,6 +13,7 @@ # tests cython, + git, pytestCheckHook, pytest-mock, }: @@ -42,47 +43,11 @@ buildPythonPackage rec { nativeCheckInputs = [ cython + git pytestCheckHook pytest-mock ]; - disabledTests = [ - # Tests require a Git checkout - "test_configure_data" - "test_contents" - "test_contents" - "test_contents_license_file" - "test_contents_subdirs" - "test_contents_unstaged" - "test_detect_wheel_tag_module" - "test_detect_wheel_tag_script" - "test_dynamic_version" - "test_editable_install" - "test_editable_verbose" - "test_editble_reentrant" - "test_entrypoints" - "test_executable_bit" - "test_executable_bit" - "test_generated_files" - "test_install_subdir" - "test_license_pep639" - "test_limited_api" - "test_link_library_in_subproject" - "test_local_lib" - "test_long_path" - "test_meson_build_metadata" - "test_pep621_metadata" - "test_pure" - "test_purelib_and_platlib" - "test_reproducible" - "test_rpath" - "test_scipy_like" - "test_sharedlib_in_package" - "test_symlinks" - "test_uneeded_rpath" - "test_user_args" - "test_vendored_meson" - ]; # meson-python respectes MACOSX_DEPLOYMENT_TARGET, but compares it with the # actual platform version during tests, which mismatches. # https://github.com/mesonbuild/meson-python/issues/760 From 8070d9c8beec8a9d8abab150a63ae1885e75222f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 8 Jun 2025 21:28:34 +0200 Subject: [PATCH 114/115] python3Packages.meson-python: replace darwin workaround with upstream patch Benefit is that this will break on the version bump and we'll remember to remove it. --- .../python-modules/meson-python/default.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix index 917cdd88e221..6364fc2bf8ce 100644 --- a/pkgs/development/python-modules/meson-python/default.nix +++ b/pkgs/development/python-modules/meson-python/default.nix @@ -1,8 +1,8 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, + fetchpatch, pythonOlder, # build-system, dependencies @@ -29,6 +29,14 @@ buildPythonPackage rec { hash = "sha256-xWqZ7J32aaQGYv5GlgMhr25LFBBsFNsihwnBYo4jhI0="; }; + patches = [ + (fetchpatch { + # TODO: Remove in 0.19.0 + url = "https://github.com/mesonbuild/meson-python/commit/1e69e7a23f2b24d688dc4220e93de6f0e2bcf9d2.patch"; + hash = "sha256-FC2ll/OrLV1R0CDB6UkrknVASJQ7rSU+sApdAk75x44="; + }) + ]; + build-system = [ meson ninja @@ -48,17 +56,6 @@ buildPythonPackage rec { pytest-mock ]; - # meson-python respectes MACOSX_DEPLOYMENT_TARGET, but compares it with the - # actual platform version during tests, which mismatches. - # https://github.com/mesonbuild/meson-python/issues/760 - preCheck = - if stdenv.hostPlatform.isDarwin then - '' - unset MACOSX_DEPLOYMENT_TARGET - '' - else - null; - setupHooks = [ ./add-build-flags.sh ]; meta = { From 4affcf85e0f6ca2047e7646495ea4545cddb5497 Mon Sep 17 00:00:00 2001 From: Tyler Langlois Date: Mon, 14 Apr 2025 16:28:12 -0600 Subject: [PATCH 115/115] sqlite: 3.48.0 -> 3.50.1 This update includes a move from autotools to autosetup, which requires from build/configure flag changes. 3.49.1 included some bugs with static compilation which 3.49.2 fixes. 3.50.1 was released during the merge request's lifetime and included for further stabilization improvements to sqlite. NB first iterations of this included tcl in the inputs; but per some scattered repository comments, tcl is currently unreliable (broken?) in static. --- .../sqlite/3.48.0-fk-conflict-handling.patch | 16 ------- .../libraries/sqlite/Libs.private.patch | 11 ----- pkgs/development/libraries/sqlite/default.nix | 45 ++++++++++--------- pkgs/development/libraries/sqlite/tools.nix | 4 +- 4 files changed, 26 insertions(+), 50 deletions(-) delete mode 100644 pkgs/development/libraries/sqlite/3.48.0-fk-conflict-handling.patch delete mode 100644 pkgs/development/libraries/sqlite/Libs.private.patch diff --git a/pkgs/development/libraries/sqlite/3.48.0-fk-conflict-handling.patch b/pkgs/development/libraries/sqlite/3.48.0-fk-conflict-handling.patch deleted file mode 100644 index 6e3f58a7212d..000000000000 --- a/pkgs/development/libraries/sqlite/3.48.0-fk-conflict-handling.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/sqlite3.c b/sqlite3.c -index 80433f6..7c234f6 100644 ---- a/sqlite3.c -+++ b/sqlite3.c -@@ -231721,6 +231721,11 @@ static int sessionChangesetApply( - } - } - -+ { -+ int rc2 = sqlite3_exec(db, "PRAGMA defer_foreign_keys = 0", 0, 0, 0); -+ if( rc==SQLITE_OK ) rc = rc2; -+ } -+ - if( (flags & SQLITE_CHANGESETAPPLY_NOSAVEPOINT)==0 ){ - if( rc==SQLITE_OK ){ - rc = sqlite3_exec(db, "RELEASE changeset_apply", 0, 0, 0); diff --git a/pkgs/development/libraries/sqlite/Libs.private.patch b/pkgs/development/libraries/sqlite/Libs.private.patch deleted file mode 100644 index e20d7ff18cc5..000000000000 --- a/pkgs/development/libraries/sqlite/Libs.private.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/sqlite3.pc.in b/sqlite3.pc.in -index a9f941b..3799671 100644 ---- a/sqlite3.pc.in -+++ b/sqlite3.pc.in -@@ -9,5 +9,5 @@ Name: SQLite - Description: SQL database engine - Version: @PACKAGE_VERSION@ - Libs: -L${libdir} -lsqlite3 --Libs.private: @LDFLAGS_MATH@ @LDFLAGS_ZLIB@ @LDFLAGS_ICU@ -+Libs.private: @LIBS@ - Cflags: -I${includedir} diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 4722376372e5..bd98b5bd89fb 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -6,7 +6,6 @@ zlib, readline, ncurses, - updateAutotoolsGnuConfigScriptsHook, # for tests python3Packages, @@ -19,6 +18,7 @@ interactive ? false, gitUpdater, + buildPackages, }: let @@ -27,31 +27,19 @@ in stdenv.mkDerivation rec { pname = "sqlite${lib.optionalString interactive "-interactive"}"; - version = "3.48.0"; + version = "3.50.1"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2025/sqlite-autoconf-${archiveVersion version}.tar.gz"; - hash = "sha256-rJkvf8o5id5+0f6ZwWNj+Eh5TIwyoVja/U65J6LgL9U="; + hash = "sha256-AKZRFNaXz6qP4GMCgddv0bd6/Nlc1eQOxqAsu62/6nE="; }; docsrc = fetchurl { url = "https://sqlite.org/2025/sqlite-doc-${archiveVersion version}.zip"; - hash = "sha256-PcE3/NfGrLMmr2CmG5hE3RXTdzywXnqc4nbEH3E9dlo="; + hash = "sha256-ZiIF9jOC5X0Qceqr08eQjdchFKggqOvPGg1xqdazgrQ="; }; - patches = [ - # https://sqlite.org/forum/forumpost/3380558ea82c8a3e - # Can be removed with the next release. - # Test: pkgsStatic.gnupg - ./Libs.private.patch - - # https://sqlite.org/forum/forumpost/00f3aab3d3be9690 - # https://sqlite.org/src/info/d7c07581 - # TODO: Remove in 3.49.0 - ./3.48.0-fk-conflict-handling.patch - ]; - outputs = [ "bin" "dev" @@ -61,8 +49,11 @@ stdenv.mkDerivation rec { ]; separateDebugInfo = stdenv.hostPlatform.isLinux; + depsBuildBuild = [ + buildPackages.stdenv.cc + ]; + nativeBuildInputs = [ - updateAutotoolsGnuConfigScriptsHook unzip ]; buildInputs = @@ -77,9 +68,21 @@ stdenv.mkDerivation rec { patchShebangs configure ''; - configureFlags = [ "--enable-threadsafe" ] ++ lib.optional interactive "--enable-readline"; + # sqlite relies on autosetup now; so many of the + # previously-understood flags are gone. They should instead be set + # on a per-output basis. + setOutputFlags = false; - env.NIX_CFLAGS_COMPILE = toString ([ + configureFlags = + [ + "--bindir=${placeholder "bin"}/bin" + "--includedir=${placeholder "dev"}/include" + "--libdir=${placeholder "out"}/lib" + ] + ++ lib.optional (!interactive) "--disable-readline" + ++ lib.optional (stdenv.hostPlatform.isStatic) "--disable-shared"; + + env.NIX_CFLAGS_COMPILE = toString [ "-DSQLITE_ENABLE_COLUMN_METADATA" "-DSQLITE_ENABLE_DBSTAT_VTAB" "-DSQLITE_ENABLE_JSON1" @@ -100,7 +103,7 @@ stdenv.mkDerivation rec { "-DSQLITE_SECURE_DELETE" "-DSQLITE_MAX_VARIABLE_NUMBER=250000" "-DSQLITE_MAX_EXPR_DEPTH=10000" - ]); + ]; # Test for features which may not be available at compile time preBuild = '' @@ -145,7 +148,7 @@ stdenv.mkDerivation rec { }; updateScript = gitUpdater { - # No nicer place to look for patest version. + # No nicer place to look for latest version. url = "https://github.com/sqlite/sqlite.git"; # Expect tags like "version-3.43.0". rev-prefix = "version-"; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 64c9708594e8..62d2f3c915d9 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -19,14 +19,14 @@ let }: stdenv.mkDerivation rec { inherit pname; - version = "3.48.0"; + version = "3.50.1"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2025/sqlite-src-${archiveVersion version}.zip"; - hash = "sha256-LXsDK2/f6MRCqoCfhQaHqB0GOB3uzXvjMSYB0oYS5kA="; + hash = "sha256-kJBZd3PGCknK67PBrFfbYm+sTZfLUYkIFai1KaTZw9w="; }; nativeBuildInputs = [ unzip ];