From 8fc98986d49a879db8e3fe8318557caccb43f759 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Mon, 23 Jun 2025 10:51:59 +0200 Subject: [PATCH 01/20] nodejs_20: 20.19.2 -> 20.19.3 --- pkgs/development/web/nodejs/v20.nix | 32 ++--------------------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index d5c93f3bb3c2..20ebe669387b 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -18,8 +18,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.19.2"; - sha256 = "4a7ff611d5180f4e420204fa6f22f9f9deb2ac5e98619dd9a4de87edf5b03b6e"; + version = "20.19.3"; + sha256 = "99be7b9d268d48b93be568a23240398ceacb0782dc7055b9972305c000b0e292"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch @@ -27,33 +27,5 @@ buildNodejs { ./bypass-darwin-xcrun-node16.patch ./node-npm-build-npm-package-logic.patch ./use-correct-env-in-tests.patch - - # Remove unused `fdopen` in vendored zlib, which causes compilation failures with clang 18 on Darwin. - (fetchpatch2 { - url = "https://github.com/madler/zlib/commit/4bd9a71f3539b5ce47f0c67ab5e01f3196dc8ef9.patch?full_index=1"; - extraPrefix = "deps/v8/third_party/zlib/"; - stripLen = 1; - hash = "sha256-WVxsoEcJu0WBTyelNrVQFTZxJhnekQb1GrueeRBRdnY="; - }) - # Backport V8 fixes for LLVM 19. - (fetchpatch2 { - url = "https://chromium.googlesource.com/v8/v8/+/182d9c05e78b1ddb1cb8242cd3628a7855a0336f%5E%21/?format=TEXT"; - decode = "base64 -d"; - extraPrefix = "deps/v8/"; - stripLen = 1; - hash = "sha256-bDTwFbATPn5W4VifWz/SqaiigXYDWHq785C64VezuUE="; - }) - (fetchpatch2 { - url = "https://chromium.googlesource.com/v8/v8/+/1a3ecc2483b2dba6ab9f7e9f8f4b60dbfef504b7%5E%21/?format=TEXT"; - decode = "base64 -d"; - extraPrefix = "deps/v8/"; - stripLen = 1; - hash = "sha256-6y3aEqxNC4iTQEv1oewodJrhOHxjp5xZMq1P1QL94Rg="; - }) - # fix test failure on macos 15.4 - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/33f6e1ea296cd20366ab94e666b03899a081af94.patch?full_index=1"; - hash = "sha256-aVBMcQlhQeviUQpMIfC988jjDB2BgYzlMYsq+w16mzU="; - }) ] ++ gypPatches; } From f73b190353056183f7d112880e2b6f833a5e9a4d Mon Sep 17 00:00:00 2001 From: emaryn Date: Fri, 27 Jun 2025 03:19:20 +0800 Subject: [PATCH 02/20] flutter332: 3.32.2 -> 3.32.5 --- .../compilers/flutter/versions/3_32/data.json | 112 ++++++++++-------- 1 file changed, 61 insertions(+), 51 deletions(-) diff --git a/pkgs/development/compilers/flutter/versions/3_32/data.json b/pkgs/development/compilers/flutter/versions/3_32/data.json index ace17df24812..cbbe122dc72f 100644 --- a/pkgs/development/compilers/flutter/versions/3_32/data.json +++ b/pkgs/development/compilers/flutter/versions/3_32/data.json @@ -1,17 +1,17 @@ { - "version": "3.32.2", - "engineVersion": "109150893958777c8f2215f6cfd3e89e984e8dea", + "version": "3.32.5", + "engineVersion": "dd93de6fb1776398bf586cbd477deade1391c7e4", "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=", "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416", "channel": "stable", "engineHashes": { "aarch64-linux": { - "aarch64-linux": "sha256-l/7p9fPVPIx/CqT4xTUPQLlBU18aZSlimamELMgkAjY=", - "x86_64-linux": "sha256-l/7p9fPVPIx/CqT4xTUPQLlBU18aZSlimamELMgkAjY=" + "aarch64-linux": "sha256-IUvraWqQxNba63OI4AVJNerMt6zdq5D5W8SKVMaDRLc=", + "x86_64-linux": "sha256-IUvraWqQxNba63OI4AVJNerMt6zdq5D5W8SKVMaDRLc=" }, "x86_64-linux": { - "aarch64-linux": "sha256-6shoelu1oOcTbzXlFcAOsVMF3b/3RZ2vHuMEXvKyzbo=", - "x86_64-linux": "sha256-6shoelu1oOcTbzXlFcAOsVMF3b/3RZ2vHuMEXvKyzbo=" + "aarch64-linux": "sha256-f1GZHMH6LJRSlgT1CSOGscwrkcV3EOxc61KctAXgZcM=", + "x86_64-linux": "sha256-f1GZHMH6LJRSlgT1CSOGscwrkcV3EOxc61KctAXgZcM=" } }, "dartVersion": "3.8.1", @@ -21,53 +21,53 @@ "x86_64-darwin": "sha256-S3iGDVLollApke2SnXAcV919qsDTVmz5Gf9fTletr00=", "aarch64-darwin": "sha256-haHQks9N1mBIqRsYg9sOLw7ra7gC708gsTWfKxvIK1c=" }, - "flutterHash": "sha256-bL+WRW9tOLEXeAwZKgwN4y8Vj6s6FOCUm3JJilLCkY8=", + "flutterHash": "sha256-qiFYbKUVdRNc2RV6uJAayQ7PrMZWNziAgI8++KEMpxA=", "artifactHashes": { "android": { - "aarch64-darwin": "sha256-VW1JzE6NfpGk2WFyPnvgkhlc+/dgkVtfPJ3HLF2SxjM=", - "aarch64-linux": "sha256-aNZyIBedC35v2/lePY1UcJYP3Wh0JccPrsABHlhdoOI=", - "x86_64-darwin": "sha256-VW1JzE6NfpGk2WFyPnvgkhlc+/dgkVtfPJ3HLF2SxjM=", - "x86_64-linux": "sha256-aNZyIBedC35v2/lePY1UcJYP3Wh0JccPrsABHlhdoOI=" + "aarch64-darwin": "sha256-JBBlXNXcBbygs7GNCcTYmeSuKOjTKHMZsiuSHiuWWM4=", + "aarch64-linux": "sha256-72mofJFv9hVFaPK3sj57fqcF7NvcDgLHD0QILZ6TM7M=", + "x86_64-darwin": "sha256-JBBlXNXcBbygs7GNCcTYmeSuKOjTKHMZsiuSHiuWWM4=", + "x86_64-linux": "sha256-72mofJFv9hVFaPK3sj57fqcF7NvcDgLHD0QILZ6TM7M=" }, "fuchsia": { - "aarch64-darwin": "sha256-8Jo1dP2uugp75BjQvvgvxnCJI0oyLlClJ2YaaiSkJzs=", - "aarch64-linux": "sha256-8Jo1dP2uugp75BjQvvgvxnCJI0oyLlClJ2YaaiSkJzs=", - "x86_64-darwin": "sha256-8Jo1dP2uugp75BjQvvgvxnCJI0oyLlClJ2YaaiSkJzs=", - "x86_64-linux": "sha256-8Jo1dP2uugp75BjQvvgvxnCJI0oyLlClJ2YaaiSkJzs=" + "aarch64-darwin": "sha256-aJmLxwEBV8VronlVcPazczpcVxl30A+y2v6LtpXQ+ug=", + "aarch64-linux": "sha256-aJmLxwEBV8VronlVcPazczpcVxl30A+y2v6LtpXQ+ug=", + "x86_64-darwin": "sha256-aJmLxwEBV8VronlVcPazczpcVxl30A+y2v6LtpXQ+ug=", + "x86_64-linux": "sha256-aJmLxwEBV8VronlVcPazczpcVxl30A+y2v6LtpXQ+ug=" }, "ios": { - "aarch64-darwin": "sha256-75DZ9m1yxybk/xP2UMDr/thBtP2q3iOHPakxxHRbIWs=", - "aarch64-linux": "sha256-75DZ9m1yxybk/xP2UMDr/thBtP2q3iOHPakxxHRbIWs=", - "x86_64-darwin": "sha256-75DZ9m1yxybk/xP2UMDr/thBtP2q3iOHPakxxHRbIWs=", - "x86_64-linux": "sha256-75DZ9m1yxybk/xP2UMDr/thBtP2q3iOHPakxxHRbIWs=" + "aarch64-darwin": "sha256-6rI+Pxqqg7K2qcXZSH9/DhwJoJgEJ9+QkoyiAr0CyUo=", + "aarch64-linux": "sha256-6rI+Pxqqg7K2qcXZSH9/DhwJoJgEJ9+QkoyiAr0CyUo=", + "x86_64-darwin": "sha256-6rI+Pxqqg7K2qcXZSH9/DhwJoJgEJ9+QkoyiAr0CyUo=", + "x86_64-linux": "sha256-6rI+Pxqqg7K2qcXZSH9/DhwJoJgEJ9+QkoyiAr0CyUo=" }, "linux": { - "aarch64-darwin": "sha256-7gGCUYERyMdga0bgxWo2ZCn9yUwIKKBOuzXvNfWS6Bw=", - "aarch64-linux": "sha256-7gGCUYERyMdga0bgxWo2ZCn9yUwIKKBOuzXvNfWS6Bw=", - "x86_64-darwin": "sha256-VlkWtHFJc8AbzvQbEL8IzXNpkrz4hIR7yK+gRHH1Qtc=", - "x86_64-linux": "sha256-VlkWtHFJc8AbzvQbEL8IzXNpkrz4hIR7yK+gRHH1Qtc=" + "aarch64-darwin": "sha256-/GxeyrWsQdEX5cmFrGiRMKpPt7Hr7CgQf3eSjdcifvI=", + "aarch64-linux": "sha256-/GxeyrWsQdEX5cmFrGiRMKpPt7Hr7CgQf3eSjdcifvI=", + "x86_64-darwin": "sha256-y6yHQfiWq6G9Nc0qD8ptgqPjYWRyIEu4onwlW/AXSB0=", + "x86_64-linux": "sha256-y6yHQfiWq6G9Nc0qD8ptgqPjYWRyIEu4onwlW/AXSB0=" }, "macos": { - "aarch64-darwin": "sha256-fonn1C8JJ/Dpid6eyzqgTw5jm4dgdt1KF+sd0d5wRNc=", - "aarch64-linux": "sha256-fonn1C8JJ/Dpid6eyzqgTw5jm4dgdt1KF+sd0d5wRNc=", - "x86_64-darwin": "sha256-fonn1C8JJ/Dpid6eyzqgTw5jm4dgdt1KF+sd0d5wRNc=", - "x86_64-linux": "sha256-fonn1C8JJ/Dpid6eyzqgTw5jm4dgdt1KF+sd0d5wRNc=" + "aarch64-darwin": "sha256-80OvLcvTZ9YxgodTEPo6GF+DrFyQ9tbzAF/6AyDVqIA=", + "aarch64-linux": "sha256-80OvLcvTZ9YxgodTEPo6GF+DrFyQ9tbzAF/6AyDVqIA=", + "x86_64-darwin": "sha256-80OvLcvTZ9YxgodTEPo6GF+DrFyQ9tbzAF/6AyDVqIA=", + "x86_64-linux": "sha256-80OvLcvTZ9YxgodTEPo6GF+DrFyQ9tbzAF/6AyDVqIA=" }, "universal": { - "aarch64-darwin": "sha256-XXktfE+Rx2kj+4PYlWZmfHCRheWDF1K+kCo1McnjZao=", - "aarch64-linux": "sha256-jRJ5OLuoV0b/Rd7SpYmyjCL7ED8iWjawvS8ZMAqVowE=", - "x86_64-darwin": "sha256-lTudK0BzZznIOAc2bTildCLg0ZeLJX19suhG4ZgH1Eo=", - "x86_64-linux": "sha256-M41bQrf1amzW1QGkq37gNgN5zh3v4/+OuBxp4CWUSqI=" + "aarch64-darwin": "sha256-MbKydBhX2pT/H5E0sif/aqvMjHSB3ch8e7aiO90daIU=", + "aarch64-linux": "sha256-UHb2USyHW1zjC8lDW/NbJEIm+UWvvdl4lRp1s5tSA+c=", + "x86_64-darwin": "sha256-iFQbCFOLkD920F4gCrZDAl3cr7o+IXr3EWp5z/wj2OU=", + "x86_64-linux": "sha256-zzUQlYs+o/irWlUIZyXJ2+qFRXhhtPQNI+VPcp7uD78=" }, "web": { - "aarch64-darwin": "sha256-l6/ZekcmlueBP7DdAuQpjGuYc6MFlMSWW4tnU2PixNU=", - "aarch64-linux": "sha256-l6/ZekcmlueBP7DdAuQpjGuYc6MFlMSWW4tnU2PixNU=", - "x86_64-darwin": "sha256-l6/ZekcmlueBP7DdAuQpjGuYc6MFlMSWW4tnU2PixNU=", - "x86_64-linux": "sha256-l6/ZekcmlueBP7DdAuQpjGuYc6MFlMSWW4tnU2PixNU=" + "aarch64-darwin": "sha256-xaJtvj3UJFnMVe+CLDriQ3BqISlrIflpYXdtNuTlB3g=", + "aarch64-linux": "sha256-xaJtvj3UJFnMVe+CLDriQ3BqISlrIflpYXdtNuTlB3g=", + "x86_64-darwin": "sha256-xaJtvj3UJFnMVe+CLDriQ3BqISlrIflpYXdtNuTlB3g=", + "x86_64-linux": "sha256-xaJtvj3UJFnMVe+CLDriQ3BqISlrIflpYXdtNuTlB3g=" }, "windows": { - "x86_64-darwin": "sha256-zxVV76R80bRqzJaWCBj9RlLkpB4HmX1iTYcdLAbiqT4=", - "x86_64-linux": "sha256-zxVV76R80bRqzJaWCBj9RlLkpB4HmX1iTYcdLAbiqT4=" + "x86_64-darwin": "sha256-fgM3VMvwTGs4MVndmJmjkr3+bpS/sNcyDAnt6EBDzAM=", + "x86_64-linux": "sha256-fgM3VMvwTGs4MVndmJmjkr3+bpS/sNcyDAnt6EBDzAM=" } }, "pubspecLock": { @@ -156,11 +156,11 @@ "dependency": "direct main", "description": { "name": "built_value", - "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4", + "sha256": "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.5" + "version": "8.10.1" }, "checked_yaml": { "dependency": "direct dev", @@ -262,45 +262,55 @@ "source": "hosted", "version": "1.4.0" }, + "dart_service_protocol_shared": { + "dependency": "direct main", + "description": { + "name": "dart_service_protocol_shared", + "sha256": "1737875c176d7e3d87bb3a359182828b542fe20a0b34198b8d31a81af5c7a76d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.3" + }, "dds": { "dependency": "direct main", "description": { "name": "dds", - "sha256": "76fc5140ce4e8922711bbe6dfd3713283ecc7f386c52fc7f594cd5f3e6b80633", + "sha256": "b80c44468f5549867f65c43b0c6ecf0872261e86beb75087ed6c1d7f82e9db22", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.0.2" + "version": "5.0.3" }, "dds_service_extensions": { "dependency": "direct main", "description": { "name": "dds_service_extensions", - "sha256": "5a5f0f9af646505f5bb21159c78ae5c275cd8bdb99e1a8e27f2f395c49568743", + "sha256": "c514114300ab30a95903fed1fdcf2949d057a0ea961168ec890a2b415b3ec52a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.1" + "version": "2.0.2" }, "devtools_shared": { "dependency": "direct main", "description": { "name": "devtools_shared", - "sha256": "659e2d65aa5ef5c3551163811c5c6fa1b973b3df80d8cac6f618035edcdc1096", + "sha256": "275e48a8a145fa09c7ae433a96fd433c01cc079d39b40acf5ba883236ae2c887", "url": "https://pub.dev" }, "source": "hosted", - "version": "11.2.1" + "version": "12.0.0" }, "dtd": { "dependency": "direct main", "description": { "name": "dtd", - "sha256": "b8269bc263ef516f3fea23bb47bbbe12a808280ec57245319e538b4767ff6d18", + "sha256": "09ddb228b3d1478a093556357692a4c203ff4f9d5f8cda05dfdca0ff3fb7c5d3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.0" + "version": "4.0.0" }, "dwds": { "dependency": "direct main", @@ -496,11 +506,11 @@ "dependency": "direct main", "description": { "name": "json_rpc_2", - "sha256": "246b321532f0e8e2ba474b4d757eaa558ae4fdd0688fdbc1e1ca9705f9b8ca0e", + "sha256": "3c46c2633aec07810c3d6a2eb08d575b5b4072980db08f1344e66aeb53d6e4a7", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.3" + "version": "4.0.0" }, "logging": { "dependency": "direct main", @@ -776,11 +786,11 @@ "dependency": "direct main", "description": { "name": "sse", - "sha256": "4389a01d5bc7ef3e90fbc645f8e7c6d8711268adb1f511e14ae9c71de47ee32b", + "sha256": "fcc97470240bb37377f298e2bd816f09fd7216c07928641c0560719f50603643", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.7" + "version": "4.1.8" }, "stack_trace": { "dependency": "direct main", From 5dbda211822f404fc405f56a570812b425c6691f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Jun 2025 12:34:12 +0000 Subject: [PATCH 03/20] cyrus-imapd: 3.12.0 -> 3.12.1 --- pkgs/by-name/cy/cyrus-imapd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cy/cyrus-imapd/package.nix b/pkgs/by-name/cy/cyrus-imapd/package.nix index 8bc78f051514..c390f82234dc 100644 --- a/pkgs/by-name/cy/cyrus-imapd/package.nix +++ b/pkgs/by-name/cy/cyrus-imapd/package.nix @@ -66,13 +66,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cyrus-imapd"; - version = "3.12.0"; + version = "3.12.1"; src = fetchFromGitHub { owner = "cyrusimap"; repo = "cyrus-imapd"; tag = "cyrus-imapd-${finalAttrs.version}"; - hash = "sha256-sdHAxlrxQHzcSt2buOGfRv/OR8BYFHrNoo+r/ePVFsg="; + hash = "sha256-fwt8ierxM4bMp+ZfYINXUIcKNMnkTIWJTNWyv8GyX0c="; }; nativeBuildInputs = [ From fdcff36f32bcb3f48c24a8abafa6c2e0a36d3860 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Fri, 27 Jun 2025 21:22:24 +0200 Subject: [PATCH 04/20] papirus-maia-icon-theme: fix build --- pkgs/data/icons/papirus-maia-icon-theme/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/data/icons/papirus-maia-icon-theme/default.nix b/pkgs/data/icons/papirus-maia-icon-theme/default.nix index 3375f5668da8..4b39dc549296 100644 --- a/pkgs/data/icons/papirus-maia-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-maia-icon-theme/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { dontDropIconThemeCache = true; + dontWrapQtApps = true; + postPatch = '' substituteInPlace CMakeLists.txt --replace /usr "$out" ''; From d4cabb74d346b3952a4410b0e6167541db771974 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Fri, 27 Jun 2025 21:22:47 +0200 Subject: [PATCH 05/20] papirus-maia-icon-theme: remove usage of with lib --- pkgs/data/icons/papirus-maia-icon-theme/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/icons/papirus-maia-icon-theme/default.nix b/pkgs/data/icons/papirus-maia-icon-theme/default.nix index 4b39dc549296..aed0efe0c1ac 100644 --- a/pkgs/data/icons/papirus-maia-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-maia-icon-theme/default.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation rec { done ''; - meta = with lib; { + meta = { description = "Manjaro variation of Papirus icon theme"; homepage = "https://github.com/Ste74/papirus-maia-icon-theme"; - license = licenses.lgpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; + license = lib.licenses.lgpl3; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ romildo ]; }; } From 0754979401da94ac2bffa768ba7d469562db0f32 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Jun 2025 14:46:30 +0000 Subject: [PATCH 06/20] wtfutil: 0.43.0 -> 0.44.1 --- pkgs/by-name/wt/wtfutil/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wt/wtfutil/package.nix b/pkgs/by-name/wt/wtfutil/package.nix index 49066e647a2b..e4cb95274bf9 100644 --- a/pkgs/by-name/wt/wtfutil/package.nix +++ b/pkgs/by-name/wt/wtfutil/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "wtfutil"; - version = "0.43.0"; + version = "0.44.1"; src = fetchFromGitHub { owner = "wtfutil"; repo = "wtf"; rev = "v${version}"; - sha256 = "sha256-DFrA4bx+wSOxmt1CVA1oNiYVmcWeW6wpfR5F1tnhyDY="; + sha256 = "sha256-xjiNtaEgzJ9izGiYaR35NWpvUHvz54oCR2VYXwVQ8SU="; }; - vendorHash = "sha256-mQdKw3DeBEkCOtV2/B5lUIHv5EBp+8QSxpA13nFxESw="; + vendorHash = "sha256-Jc6kmeOLM3IWLxSwJA+nBdO76B504X/cKQ0UknlLUY4="; proxyVendor = true; doCheck = false; From 438d9185512e1ec47b1e1fd416b7576989be8862 Mon Sep 17 00:00:00 2001 From: souxd <51197853+souxd@users.noreply.github.com> Date: Fri, 7 Mar 2025 06:33:28 -0300 Subject: [PATCH 07/20] SDL2_mixer: Update dependency Upstream prefers libxmp over libmodplug now. Also, the package wasn't working with libmodplug, because it needs a build flag to build with libmodplug support in place of libxmp. It could be an option if someone is interested in implementing --- pkgs/by-name/sd/SDL2_mixer/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/sd/SDL2_mixer/package.nix b/pkgs/by-name/sd/SDL2_mixer/package.nix index 228f35554a70..a20d57de202c 100644 --- a/pkgs/by-name/sd/SDL2_mixer/package.nix +++ b/pkgs/by-name/sd/SDL2_mixer/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, flac, fluidsynth, - libmodplug, libogg, libvorbis, mpg123, @@ -40,7 +39,6 @@ stdenv.mkDerivation (finalAttrs: { SDL2 flac fluidsynth - libmodplug libogg libvorbis mpg123 From f974807cf8fbac7775d1b8a9dd40b3204c0dbaaa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jun 2025 16:52:37 +0000 Subject: [PATCH 08/20] bitrise: 2.31.2 -> 2.31.3 --- pkgs/by-name/bi/bitrise/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bi/bitrise/package.nix b/pkgs/by-name/bi/bitrise/package.nix index a33600825b4d..955cd6348d56 100644 --- a/pkgs/by-name/bi/bitrise/package.nix +++ b/pkgs/by-name/bi/bitrise/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "bitrise"; - version = "2.31.2"; + version = "2.31.3"; src = fetchFromGitHub { owner = "bitrise-io"; repo = "bitrise"; rev = "v${version}"; - hash = "sha256-WMvk5VEXc0cEWVdop50mSlAJKP8RhRijCia0fgBG79M="; + hash = "sha256-uy2B2tjtg6/ufMWy9sPoheSw2hxIsl2gUdAKVfixpoM="; }; # many tests rely on writable $HOME/.bitrise and require network access From 7993b314a4041577b9fcd0caaed70bd36a18b4f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jun 2025 17:17:44 +0000 Subject: [PATCH 09/20] gojo: 0.3.2 -> 0.3.3 --- pkgs/by-name/go/gojo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gojo/package.nix b/pkgs/by-name/go/gojo/package.nix index b675dabd5378..ed45af52f91b 100644 --- a/pkgs/by-name/go/gojo/package.nix +++ b/pkgs/by-name/go/gojo/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "gojo"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "itchyny"; repo = "gojo"; tag = "v${finalAttrs.version}"; - hash = "sha256-DMFTB5CgJTWf+P9ntgBgzdmcF2qjS9t3iUQ1Rer+Ab4="; + hash = "sha256-jHSvNxTnecusIIdyNvZsPVw34QKIm9kEvBUESG37PDY="; }; - vendorHash = "sha256-iVAPuc+83WZCs5WAAZIKEExDdwXQqswgso2XRVJB/bE="; + vendorHash = "sha256-XTrKbOXKxUjCC505ZVHbTaEvdxD4Zv0BFQhby3VwS4M="; nativeInstallCheckInputs = [ versionCheckHook From 96fb0d676476fcb42bb2e7429f37af5e2d490c74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jun 2025 17:31:45 +0000 Subject: [PATCH 10/20] got: 0.113 -> 0.115 --- pkgs/by-name/go/got/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/got/package.nix b/pkgs/by-name/go/got/package.nix index 5a78a0b44dcd..d523352a1759 100644 --- a/pkgs/by-name/go/got/package.nix +++ b/pkgs/by-name/go/got/package.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "got"; - version = "0.113"; + version = "0.115"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz"; - hash = "sha256-KUaKG5o1+iq6kygHWVvADQEKxUGSOQRo91oK02TFbwE="; + hash = "sha256-rfC8HMN0dH34+1Jbd3uPEtG/1uiTdSKBkilhssiJiec="; }; nativeBuildInputs = [ From 297ed1a686df98c980557de8eea431ad6a829f96 Mon Sep 17 00:00:00 2001 From: Jon Hermansen Date: Sun, 29 Jun 2025 13:36:55 -0400 Subject: [PATCH 11/20] gamemode: update 1.8.2 hash to include an additional commit When bootstrapping NixOS from source, I found that this package no longer builds without the cache. A quick diff of the project shows a one line change that bumps the project version in their meson build Comparing build outputs old vs. new, only store paths have changed --- pkgs/tools/games/gamemode/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/games/gamemode/default.nix b/pkgs/tools/games/gamemode/default.nix index 6c4ff49bdc25..db98dafd58a4 100644 --- a/pkgs/tools/games/gamemode/default.nix +++ b/pkgs/tools/games/gamemode/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "FeralInteractive"; repo = "gamemode"; tag = finalAttrs.version; - hash = "sha256-JkDFhFLUHlgD6RKxlxMjrSF2zQ4AWmRUQMLbWYwIZmg="; + hash = "sha256-V0rewbSVOGFqJqXyCz4jXpuDM0EfjdkpGPl+WdDwI5I="; }; outputs = [ From c757b757a98e2a2c135799d937e389dcfdc2cf99 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 29 Jun 2025 19:07:30 +0200 Subject: [PATCH 12/20] guacamole-server: unbreak, update CFLAGS --- pkgs/by-name/gu/guacamole-server/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/gu/guacamole-server/package.nix b/pkgs/by-name/gu/guacamole-server/package.nix index 9b4411f084e6..884c28a9afde 100644 --- a/pkgs/by-name/gu/guacamole-server/package.nix +++ b/pkgs/by-name/gu/guacamole-server/package.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: { NIX_CFLAGS_COMPILE = [ "-Wno-error=format-truncation" "-Wno-error=format-overflow" + "-Wno-error=deprecated-declarations" ]; strictDeps = true; From 159dc242d51ffda5690236780db6f6fa1546a89f Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 29 Jun 2025 19:43:57 +0200 Subject: [PATCH 13/20] guacamole-server: 1.6.0-unstable-2025-05-16 -> 1.6.0-unstable-2025-06-29 --- pkgs/by-name/gu/guacamole-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gu/guacamole-server/package.nix b/pkgs/by-name/gu/guacamole-server/package.nix index 884c28a9afde..196924749629 100644 --- a/pkgs/by-name/gu/guacamole-server/package.nix +++ b/pkgs/by-name/gu/guacamole-server/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "guacamole-server"; - version = "1.6.0-unstable-2025-05-16"; + version = "1.6.0-unstable-2025-06-29"; src = fetchFromGitHub { owner = "apache"; repo = "guacamole-server"; - rev = "acb69735359d4d4a08f65d6eb0bde2a0da08f751"; - hash = "sha256-rqGSQD9EYlK1E6y/3EzynRmBWJOZBrC324zVvt7c2vM="; + rev = "f3f5b9d76649ccc24f551cb166c81078f4b5e236"; + hash = "sha256-OjTwAQzKUuXfwZXLsL9XjrJc/0be38CmAGG+CoCeNwk="; }; NIX_CFLAGS_COMPILE = [ From 382ae5ceba97e95148324073676f8aa697ae217c Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Fri, 27 Jun 2025 20:04:56 -0700 Subject: [PATCH 14/20] tplay: 0.6.0 -> 0.6.l3 --- pkgs/by-name/tp/tplay/package.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/tp/tplay/package.nix b/pkgs/by-name/tp/tplay/package.nix index 2c567f0254a1..3a754ca917c4 100644 --- a/pkgs/by-name/tp/tplay/package.nix +++ b/pkgs/by-name/tp/tplay/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, pkg-config, clang, - ffmpeg, + ffmpeg-headless, openssl, alsa-lib, opencv, @@ -12,17 +12,17 @@ }: rustPlatform.buildRustPackage rec { pname = "tplay"; - version = "0.6.0"; + version = "0.6.3"; src = fetchFromGitHub { owner = "maxcurzi"; repo = "tplay"; rev = "v${version}"; - hash = "sha256-SRn7kg5FdSimKMFowKNUIan+MrojtNO0apeehIRTzfw="; + hash = "sha256-JVkezG2bs99IFOTONeZZRljjbi0EhFf+DMxcfiWI4p4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-SzOx9IPp+TjiJpAEX8+GhZ+UEEmqNpI67S40OiYrHfM="; + cargoHash = "sha256-LHRTmjAwDPMOP6YQfL01leEzqRKtteU1cnUqL6UeWKk="; checkFlags = [ # requires network access "--skip=pipeline::image_pipeline::tests::test_process" @@ -35,20 +35,19 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook pkg-config clang - ffmpeg makeWrapper ]; buildInputs = [ openssl.dev alsa-lib.dev - ffmpeg.dev + ffmpeg-headless.dev opencv ]; postFixup = '' wrapProgram $out/bin/tplay \ - --prefix PATH : "${lib.makeBinPath [ ffmpeg ]}" + --prefix PATH : "${lib.makeBinPath [ ffmpeg-headless ]}" ''; meta = { From 0db7aecca9c682550246c73a32e7afd8d2eb342a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Jun 2025 22:58:58 +0000 Subject: [PATCH 15/20] python3Packages.pyezvizapi: 1.0.0.9 -> 1.0.1.0 --- pkgs/development/python-modules/pyezvizapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyezvizapi/default.nix b/pkgs/development/python-modules/pyezvizapi/default.nix index 51ade8376315..788fe5a452f6 100644 --- a/pkgs/development/python-modules/pyezvizapi/default.nix +++ b/pkgs/development/python-modules/pyezvizapi/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyezvizapi"; - version = "1.0.0.9"; + version = "1.0.1.0"; pyproject = true; src = fetchFromGitHub { owner = "RenierM26"; repo = "pyEzvizApi"; tag = version; - hash = "sha256-iqTNkfecBrxJ3BwACbMmcHqequ6IUzjL550ip+jNIrs="; + hash = "sha256-6Kwo7E+lmyqw0VpqH6AOn27tPvNPA/PgDiGSuGXo6PA="; }; build-system = [ setuptools ]; From 4b41b58356f36117bd9261a687c3fbbbee43e78e Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Mon, 30 Jun 2025 01:16:37 +0200 Subject: [PATCH 16/20] lixPackageSets.lix_2_91: patch for the critical correctness bug This adds also other bugs fixes as a fallout of the CVE fixes. https://lix.systems/blog/2025-06-27-lix-critical-bug/ Change-Id: I3af853f12b8ba9741f2180b82b5fb394b91defbf Signed-off-by: Raito Bezarius --- pkgs/tools/package-management/lix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index 6df8255dd7ea..b1569bf33675 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -154,13 +154,13 @@ lib.makeExtensible (self: { attrName = "lix_2_91"; lix-args = rec { - version = "2.91.2"; + version = "2.91.3"; src = fetchFromGitHub { owner = "lix-project"; repo = "lix"; rev = version; - hash = "sha256-TkRjskDnxMPugdLQE/LqIh59RYQFJLYpIuL8YZva2lM="; + hash = "sha256-b5d+HnPcyHz0ZJW1+LZl4qm4LGTB/TiaDFQVlVL2xpE="; }; docCargoDeps = rustPlatform.fetchCargoVendor { From 6d088d36d48a5c7b8960be989137db7e9163bcdf Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Mon, 30 Jun 2025 01:16:55 +0200 Subject: [PATCH 17/20] lixPackageSets.lix_2_92: patch for the critical correctness bug This adds also other bugs fixes as a fallout of the CVE fixes. https://lix.systems/blog/2025-06-27-lix-critical-bug/ Change-Id: I292c17120064d4af751d0a409511d1041f4bdb51 Signed-off-by: Raito Bezarius --- pkgs/tools/package-management/lix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index b1569bf33675..5fbe395c416a 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -186,13 +186,13 @@ lib.makeExtensible (self: { attrName = "lix_2_92"; lix-args = rec { - version = "2.92.2"; + version = "2.92.3"; src = fetchFromGitHub { owner = "lix-project"; repo = "lix"; rev = version; - hash = "sha256-D7YepvFkGE4K1rOkEYA1P6wGj/eFbQXb03nLdBRjjwA="; + hash = "sha256-iP2iUDxA99RcgQyZROs7bQw8pqxa1vFudRqjAIHg9Iw="; }; cargoDeps = rustPlatform.fetchCargoVendor { From 83087bcb93f7bd73757211fad8593c2c332a49e2 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Mon, 30 Jun 2025 01:26:51 +0200 Subject: [PATCH 18/20] lixPackageSets.lix_2_93: patch for the critical correctness bug This adds also other bugs fixes as a fallout of the CVE fixes. https://lix.systems/blog/2025-06-27-lix-critical-bug/ Change-Id: I9949f4a488db0862ff62ef45736358bd4acda341 Signed-off-by: Raito Bezarius --- pkgs/tools/package-management/lix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index 5fbe395c416a..42bc8c641a69 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -216,14 +216,14 @@ lib.makeExtensible (self: { attrName = "lix_2_93"; lix-args = rec { - version = "2.93.1"; + version = "2.93.2"; src = fetchFromGitea { domain = "git.lix.systems"; owner = "lix-project"; repo = "lix"; rev = version; - hash = "sha256-LmQhjQ7c+AOkwhvR9GFgJOy8oHW35MoQRELtrwyVnPw="; + hash = "sha256-J4ycLoXHPsoBoQtEXFCelL4xlq5pT8U9tNWNKm43+YI="; }; cargoDeps = rustPlatform.fetchCargoVendor { From 24a74cc56223a9fee3010319e99fa1de7d367934 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 30 Jun 2025 09:43:57 +0800 Subject: [PATCH 19/20] buf: use finalAttrs --- pkgs/by-name/bu/buf/package.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/bu/buf/package.nix b/pkgs/by-name/bu/buf/package.nix index eb93cae6c90d..b5bf7fd05713 100644 --- a/pkgs/by-name/bu/buf/package.nix +++ b/pkgs/by-name/bu/buf/package.nix @@ -5,18 +5,17 @@ protobuf, git, testers, - buf, installShellFiles, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "buf"; version = "1.55.1"; src = fetchFromGitHub { owner = "bufbuild"; repo = "buf"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-41IY2P2s9kCV6aQh5vg7xVmu4Ovl9gakGmgcI/QSwfw="; }; @@ -81,11 +80,11 @@ buildGoModule rec { runHook postInstall ''; - passthru.tests.version = testers.testVersion { package = buf; }; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = { homepage = "https://buf.build"; - changelog = "https://github.com/bufbuild/buf/releases/tag/v${version}"; + changelog = "https://github.com/bufbuild/buf/releases/tag/v${finalAttrs.version}"; description = "Create consistent Protobuf APIs that preserve compatibility and comply with design best-practices"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ @@ -95,4 +94,4 @@ buildGoModule rec { ]; mainProgram = "buf"; }; -} +}) From 8121260fd3cff9095cfa37c732de657e08cae453 Mon Sep 17 00:00:00 2001 From: GKHWB Date: Mon, 23 Jun 2025 18:35:43 -0400 Subject: [PATCH 20/20] jellyfin-tui:1.1.3->1.2.1 --- pkgs/by-name/je/jellyfin-tui/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/je/jellyfin-tui/package.nix b/pkgs/by-name/je/jellyfin-tui/package.nix index 6770cebaff7c..e4764ba129d5 100644 --- a/pkgs/by-name/je/jellyfin-tui/package.nix +++ b/pkgs/by-name/je/jellyfin-tui/package.nix @@ -6,22 +6,23 @@ openssl, mpv, nix-update-script, + writableTmpDirAsHomeHook, versionCheckHook, }: rustPlatform.buildRustPackage rec { pname = "jellyfin-tui"; - version = "1.1.3"; + version = "1.2.1"; src = fetchFromGitHub { owner = "dhonus"; repo = "jellyfin-tui"; tag = "v${version}"; - hash = "sha256-zTvycwmVTUK7qP9PacHeREhVk0UJ4fos0Z2OGdWI0Mg="; + hash = "sha256-9TSg7J5Pbb2cpL9fEMs5ZJjmA70o8TEmbDkYIK2inTc="; }; useFetchCargoVendor = true; - cargoHash = "sha256-nBtz05c4W5qIiOPfQ+PGy0LVvvXXCFmdfjk2VjBMvnE="; + cargoHash = "sha256-dFUUJovJcf5pzH9nta7G+E7hcZTZONLPgQ1HAX4RYrY="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ @@ -30,9 +31,14 @@ rustPlatform.buildRustPackage rec { ]; nativeInstallCheckInputs = [ + writableTmpDirAsHomeHook versionCheckHook ]; versionCheckProgramArg = "--version"; + versionCheckKeepEnvironment = [ "HOME" ]; + preInstallCheck = '' + mkdir -p $HOME/.local/share + ''; doInstallCheck = true; passthru.updateScript = nix-update-script { };