From 0024e5487a7276e9a40c670a1ab8082252a7416e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Fri, 24 May 2024 19:11:54 -0400 Subject: [PATCH 01/22] nixos/journalwatch: add package option (cherry picked from commit 04548e7e1f256a0ff270f48d0a4dbc224aeeb728) --- nixos/modules/services/logging/journalwatch.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/logging/journalwatch.nix b/nixos/modules/services/logging/journalwatch.nix index 71b29d57b7eb..48fd992ffb65 100644 --- a/nixos/modules/services/logging/journalwatch.nix +++ b/nixos/modules/services/logging/journalwatch.nix @@ -56,6 +56,8 @@ in { ''; }; + package = mkPackageOption pkgs "journalwatch" { }; + priority = mkOption { type = types.int; default = 6; @@ -240,7 +242,7 @@ in { # requires a relative directory name to create beneath /var/lib StateDirectory = user; StateDirectoryMode = "0750"; - ExecStart = "${pkgs.python3Packages.journalwatch}/bin/journalwatch mail"; + ExecStart = "${getExe cfg.package} mail"; # lowest CPU and IO priority, but both still in best-effort class to prevent starvation Nice=19; IOSchedulingPriority=7; From 5b029c8db66150c8586fddfa83f0004af59f80c4 Mon Sep 17 00:00:00 2001 From: Yaya Date: Thu, 13 Jun 2024 13:07:52 +0200 Subject: [PATCH 02/22] electron_28-bin: 28.3.1 -> 28.3.3 - Changelog: https://github.com/electron/electron/releases/tag/v28.3.3 - Diff: https://github.com/electron/electron/compare/refs/tags/v28.3.1...v28.3.3 (cherry picked from commit 7f0243c8fe6a8dbf11cc79edf6b890506d2646a7) --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index fedd02fe733d..7d1f59221c1b 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -23,14 +23,14 @@ }, "28": { "hashes": { - "aarch64-darwin": "53fc040cd09e955e013254f784cf51712029ded4a574559cf5fa19c9a911d75d", - "aarch64-linux": "3e46c3076041386213f7b9ebc12335889fbad5822ffc306cf7514abb88de8512", - "armv7l-linux": "2e22fbab2376a9bbeb8cbdd7d9bb3ca69fda6adeafa2b22ffb67157fcfcdb6ff", - "headers": "07iv5fh0yxv17c1akb2j4ab5xhv29d9zsgi6dm2r0n4pnf72wxwr", - "x86_64-darwin": "bd8a220fd906625ad4a8edf92e80e8eff89d51f40c22168e05090daa7c12bd66", - "x86_64-linux": "e3be93e1a15d61f72e074aee021e12f20465b81f51b8c1170bd9072d7d695c3a" + "aarch64-darwin": "c310ab098d8849c4aa05f05b1c8521031241a046e023a911f964fd1db31c64c9", + "aarch64-linux": "f77107266581a6b9880757876518df1c4bf6eeff5c193bb5de0a8f6c9902bd1f", + "armv7l-linux": "384d8b43f52b5350a438031ad12980418fc244b4b0aecfa5f7dcc3d6f103ebed", + "headers": "1d407g6yb81l9p0pbsidrsmnzkrwb4f2qb221kc9k2r7qdpf64px", + "x86_64-darwin": "6bc63916b7fe52de7559e7631fef5c93315a18ee90a0d3d08168c91414b09ecf", + "x86_64-linux": "20f6be493cbd6c9924206e744b1c490af1f97f4735451b9dc19f0d305366d546" }, - "version": "28.3.1" + "version": "28.3.3" }, "29": { "hashes": { From 8e163a0116689ceccc0744c415d301cfb7e36893 Mon Sep 17 00:00:00 2001 From: Yaya Date: Thu, 13 Jun 2024 13:07:56 +0200 Subject: [PATCH 03/22] electron_29-bin: 29.4.0 -> 29.4.2 - Changelog: https://github.com/electron/electron/releases/tag/v29.4.2 - Diff: https://github.com/electron/electron/compare/refs/tags/v29.4.0...v29.4.2 (cherry picked from commit c391e6c7e929b5333f2fe2ad4f9591a96b032096) --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 7d1f59221c1b..3fb13870c991 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -34,14 +34,14 @@ }, "29": { "hashes": { - "aarch64-darwin": "c16d05f1231bb3c77da05ab236b454b3a2b6a642403be51e7c9b16cd2c421a19", - "aarch64-linux": "c3764d6c3799950e3418e8e5a5a5b2c41abe421dd8bcdebf054c7c85798d9860", - "armv7l-linux": "c5e92943ad78b4e41a32ae53c679e148ea2ae09f95f914b1834dbdbae578ba91", - "headers": "0macff2ir515szp2nd6jimnpg9ig87whhfi08h2hwaxp4xn9j5hn", - "x86_64-darwin": "8ed7924f77a5c43c137a57097c5c47c2e8e9a78197e18af11a767c98035c123e", - "x86_64-linux": "91e5eb374c2c85a07c2d4e99a89eb18515ff0169a49c3fa75289800e1225729e" + "aarch64-darwin": "e9934a8eaecaab05dcc572b47576cdba78491c144c19348c9c9e9524c8c5917b", + "aarch64-linux": "a5c2bc148d3f6c3ee2bd15289243a1b75093afde3753d0aa1125d2cb621f5b59", + "armv7l-linux": "a75e2487ea1a1b292fbc160618167c204f161c602780f2b997b75d6ef5bbe539", + "headers": "0z4n8c95z48n54d1fph2p2i6cb43gk202zg09vmv168ajpspi2rr", + "x86_64-darwin": "b875c884efe86eb2e1922781f55193d82520e923510f19af87a58dfe07d21562", + "x86_64-linux": "eb07a8137fde970450242c51e0c2f8ef6556f377a21c357584aa2632ee9e1d3f" }, - "version": "29.4.0" + "version": "29.4.2" }, "30": { "hashes": { From 7c7417bdbaba57aef454e68237523b29ee0fc00b Mon Sep 17 00:00:00 2001 From: Yaya Date: Thu, 13 Jun 2024 13:08:00 +0200 Subject: [PATCH 04/22] electron_30-bin: 30.0.6 -> 30.1.1 - Changelog: https://github.com/electron/electron/releases/tag/v30.1.1 - Diff: https://github.com/electron/electron/compare/refs/tags/v30.0.6...v30.1.1 (cherry picked from commit df4ae42c07540bfdeea1243052707e02979eb556) --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 3fb13870c991..d5760841b2e2 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -45,13 +45,13 @@ }, "30": { "hashes": { - "aarch64-darwin": "9189d4a8d69175d94edafa4cb29a47389ebaff22c9baf0dd67a448e7a5240129", - "aarch64-linux": "37b520604e319f86f372cc1da8244b27d24708a4bdc1cc07a6f1d793f37e96c3", - "armv7l-linux": "6202a7ccde4ca344c01c124bd997bcfad06d475dd2e35bba70379cf2d93b5268", - "headers": "15nzay60m1v720243n3iizbcldn6ka9vcphh050pih8rnh74ds5p", - "x86_64-darwin": "7d9e81712a4b0ab209d03d0eef08ee9c4da1f5293fb169ff08766356a2e65fbb", - "x86_64-linux": "5a2bfd0f6a8703dd1b408675c9349732c4713b378d9ae0f64ea4661f6b5c7fd4" + "aarch64-darwin": "7497d7926a094d6e1bf34f70ef206c4f2d9df072b1f9fa8cd431f6ea4fab680c", + "aarch64-linux": "bdb3485cd87861bb1d99f6b417f979ac899974a4322191a648efc311af9f8c5c", + "armv7l-linux": "3941ab1f23576d8f55fdf525e40387f97c2c9809173a8a933402b62ec95a592f", + "headers": "1jz8grs7sjncg68s34hf7rhd830414avxs1xg5lng5n7wmwfiw8i", + "x86_64-darwin": "bdadef26dac934416b17fa2af6bcd55424eb8b1ceb5f6fae068dbd5fd8b0d357", + "x86_64-linux": "4d00e8cd5f37962dc8fbefe2941d89dcb1c180f1568bb32122c7eb40d21f39c4" }, - "version": "30.0.6" + "version": "30.1.1" } } From af11aff390a8790c3dada2683fbbb8a60b8c7f09 Mon Sep 17 00:00:00 2001 From: Yaya Date: Thu, 13 Jun 2024 13:08:11 +0200 Subject: [PATCH 05/22] electron-source.electron_29: 29.4.0 -> 29.4.2 - Changelog: https://github.com/electron/electron/releases/tag/v29.4.2 - Diff: https://github.com/electron/electron/compare/refs/tags/v29.4.0...v29.4.2 (cherry picked from commit 290687fa3ad8a922886d890b6f33c148a16a21fe) --- pkgs/development/tools/electron/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index cf5b041441ff..23e3a670784f 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -1831,10 +1831,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-YTuHUvqbVVq3gwfDFOzlRIlmfnm74u3soHem1jCVVaA=", + "hash": "sha256-hyk8RsG2hIsAZRiJuYRF6HC+K7TyA76qiYsc2sH0Apw=", "owner": "electron", "repo": "electron", - "rev": "v29.4.0" + "rev": "v29.4.2" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -2686,7 +2686,7 @@ "electron_yarn_hash": "0f868gk3d2cablpczav8a4vhk4nfirph45yzjz18mgzgday7w8hf", "modules": "121", "node": "20.9.0", - "version": "29.4.0" + "version": "29.4.2" }, "30": { "chrome": "124.0.6367.207", From b98a7f8892529b3ec5b7273edf151db0a7a63414 Mon Sep 17 00:00:00 2001 From: Yaya Date: Thu, 13 Jun 2024 13:08:17 +0200 Subject: [PATCH 06/22] electron-source.electron_30: 30.0.6 -> 30.1.1 - Changelog: https://github.com/electron/electron/releases/tag/v30.1.1 - Diff: https://github.com/electron/electron/compare/refs/tags/v30.0.6...v30.1.1 (cherry picked from commit 8fae4e54b1661fd1c4859cb82eeb75e66ba635e9) --- pkgs/development/tools/electron/info.json | 50 +++++++++++------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 23e3a670784f..e642dce32d99 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -2689,7 +2689,7 @@ "version": "29.4.2" }, "30": { - "chrome": "124.0.6367.207", + "chrome": "124.0.6367.243", "chromium": { "deps": { "gn": { @@ -2699,15 +2699,15 @@ "version": "2024-03-14" } }, - "version": "124.0.6367.207" + "version": "124.0.6367.243" }, "chromium_npm_hash": "sha256-oILlQlzTcc0YqAvK5htRvG/YXWJTDtJ60Z1EcBEj9dw=", "deps": { "src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-mMc1mWre9XeeR4jPn30RxAXadjyqcyVyHDjSVrI5lpI=", + "hash": "sha256-YrAJnuNig6v87+eNnZ2W+PCzxjGe5CuymF6ul/v9SCk=", "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -r $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", - "rev": "124.0.6367.207", + "rev": "124.0.6367.243", "url": "https://chromium.googlesource.com/chromium/src.git" }, "src/chrome/test/data/perf/canvas_bench": { @@ -2736,10 +2736,10 @@ }, "src/electron": { "fetcher": "fetchFromGitHub", - "hash": "sha256-6f/6Deqysv8MubMjyxjiDM55DXG/9wTqBWW+zC+9OBE=", + "hash": "sha256-VWc9I5wpQYv13I1xgLQVqDg6IfXMinrzJmkMaIsEY90=", "owner": "electron", "repo": "electron", - "rev": "v30.0.6" + "rev": "v30.1.1" }, "src/media/cdm/api": { "fetcher": "fetchFromGitiles", @@ -2761,8 +2761,8 @@ }, "src/third_party/angle": { "fetcher": "fetchFromGitiles", - "hash": "sha256-zEDHotJ6OSQlgq3nkVMhLll4j5iYl5sA1JFv854EIdM=", - "rev": "c67f290ef0f0433acb766c024d28c6f59f48b909", + "hash": "sha256-MFXZ7gEO8vHFHtjzzLSgGlB9AKx+hndPfmwsE5XHGXo=", + "rev": "bda89e1f7c7195a9d03d037039c2dd5057563a59", "url": "https://chromium.googlesource.com/angle/angle.git" }, "src/third_party/angle/third_party/VK-GL-CTS/src": { @@ -2899,14 +2899,14 @@ }, "src/third_party/dawn": { "fetcher": "fetchFromGitiles", - "hash": "sha256-GUB25IUviLFxGI3UQJS/kf51BZBeoYFqbiaSTSY11qA=", - "rev": "394edde38c9323f7c910e3bdec9b7efc4ee39379", + "hash": "sha256-W0E0fhjAc5gdTgIsy+iOAFA7GPEFeMPPJEU5nnRUtbM=", + "rev": "e04b03f714994b7a747b5472da4ffae9e6e38938", "url": "https://dawn.googlesource.com/dawn.git" }, "src/third_party/dawn/third_party/dxc": { "fetcher": "fetchFromGitiles", - "hash": "sha256-wsQtYqH8gFsDmLTUA7SKvTYiGQWX7Vbcz1QtsAg/epY=", - "rev": "bd7aa97798735e1288d36de41dcda75e867550e4", + "hash": "sha256-bqzkbBbf1btIz84odYfC3c69m6kgssHy2+a9aR+EUaQ=", + "rev": "511cfef8e0509d172fbfa156be8a97ed2b42590b", "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" }, "src/third_party/dawn/third_party/dxheaders": { @@ -2965,10 +2965,10 @@ }, "src/third_party/electron_node": { "fetcher": "fetchFromGitHub", - "hash": "sha256-9/TPxYbnQPDpWf/Zti8bTh22e/uFRlzs7SCThfx/byQ=", + "hash": "sha256-15RUrS+zjp0nOveBnZB3bvEv36noZr2ergtNL7ky8iQ=", "owner": "nodejs", "repo": "node", - "rev": "v20.11.1" + "rev": "v20.14.0" }, "src/third_party/emoji-segmenter/src": { "fetcher": "fetchFromGitiles", @@ -3286,8 +3286,8 @@ }, "src/third_party/openscreen/src": { "fetcher": "fetchFromGitiles", - "hash": "sha256-wUKhF9sU1HAZvs4fQHxeFfxkpkhBp6nTljJrQ4lH7lA=", - "rev": "a3f9719bed95289c59771d4c4bcb85f5ecacac43", + "hash": "sha256-4Qd5nHJxIOY7ifPy6Xf0TgZK0TkZY48scOkJ25kMCjk=", + "rev": "90e48ecc4ed9feeba36f49065c738d620d6f0780", "url": "https://chromium.googlesource.com/openscreen" }, "src/third_party/openscreen/src/buildtools": { @@ -3310,8 +3310,8 @@ }, "src/third_party/pdfium": { "fetcher": "fetchFromGitiles", - "hash": "sha256-4CPHeZAJM756a2TIxs4ZX0D7j85deDIf/bTGow75m/U=", - "rev": "7b90b15a21cfdd3d74525616b5de04df94fa0583", + "hash": "sha256-/gSW4sd2AN4m3aIs9AojqsfrXeCNNrl7wFM54KeQVxw=", + "rev": "dcdd830ae4e1b14f85383d1baf84efee6bc853cc", "url": "https://pdfium.googlesource.com/pdfium.git" }, "src/third_party/perfetto": { @@ -3370,8 +3370,8 @@ }, "src/third_party/skia": { "fetcher": "fetchFromGitiles", - "hash": "sha256-8C8IMQjfJGeCXCXZyd/eSbDNsdcKI/Bul0m1wrqx1P8=", - "rev": "e2ea2eb3e0d37fff47968dfaaa337debb3b75b1e", + "hash": "sha256-zHfv4OZK/nVJc2rl+dBSCc4f6qndpAKcFZtThw06+LY=", + "rev": "a747f7ea37db6ea3871816dbaf2eb41b5776c826", "url": "https://skia.googlesource.com/skia.git" }, "src/third_party/smhasher/src": { @@ -3595,14 +3595,14 @@ }, "src/v8": { "fetcher": "fetchFromGitiles", - "hash": "sha256-8/XD/LwnCXDiVWeZvZsgvmSWpfVLILlaTtqw87V0Pgk=", - "rev": "ac8da461a20281ff8c30507cbdd7e6fed39fd183", + "hash": "sha256-ME/O8CJASZ8Ql931EaTRM3+6lLzGx1us/cK9Dv7Bd+s=", + "rev": "cc9dc1eb196bc3cbeca92eeec62949b4ac7cd757", "url": "https://chromium.googlesource.com/v8/v8.git" } }, - "electron_yarn_hash": "0f868gk3d2cablpczav8a4vhk4nfirph45yzjz18mgzgday7w8hf", + "electron_yarn_hash": "0w41mjfnrhmkf2qy4lk5zwhc7afkaiqypxs4379s4ay1r6zpvf6q", "modules": "123", - "node": "20.11.1", - "version": "30.0.6" + "node": "20.14.0", + "version": "30.1.1" } } From 83b9550e91877364aa43c249a33947661be6dc2c Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 12 May 2024 20:13:06 +0200 Subject: [PATCH 07/22] liblxi: fix darwin build, use finalAttrs (cherry picked from commit 78da6b378b84f3217890f2b1db98f8a838ed8375) --- pkgs/development/libraries/liblxi/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/liblxi/default.nix b/pkgs/development/libraries/liblxi/default.nix index 8531c8ea7c4c..24c454d4ee7e 100644 --- a/pkgs/development/libraries/liblxi/default.nix +++ b/pkgs/development/libraries/liblxi/default.nix @@ -3,17 +3,24 @@ , libtirpc, rpcsvc-proto, avahi, libxml2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "liblxi"; version = "1.20"; src = fetchFromGitHub { owner = "lxi-tools"; repo = "liblxi"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-jS0huNkbyKrsJ3NkenrYtjkzLakOsTJpwlgSo98ribE="; }; + postPatch = '' + # needed by darwin + sed -e 1i'#include ' \ + -e 1i'#include ' \ + -i src/bonjour.c + ''; + nativeBuildInputs = [ meson ninja cmake pkg-config rpcsvc-proto ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ @@ -36,4 +43,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = [ maintainers.vq ]; }; -} +}) From 92b4f83483118ad3857d11c6923c151d59b1194c Mon Sep 17 00:00:00 2001 From: t-gebauer Date: Sat, 15 Jun 2024 11:57:17 +0200 Subject: [PATCH 08/22] vimPlugins.neogit: pin to v0.0.1 The latest neovim 0.9.5 compatible version. --- pkgs/applications/editors/vim/plugins/generated.nix | 6 +++--- pkgs/applications/editors/vim/plugins/vim-plugin-names | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index d6089e70b84d..ea7fcb1459ae 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6577,12 +6577,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2024-05-16"; + version = "v0.0.1"; # manually pinned on 24.05; the latest neovim 0.9.5 compatible version src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "9040f6face04f93e6903f25f038d67550fc9027b"; - sha256 = "1sdkn3aapqd5kgbgm1gyam7fc46xzvq4f2ivayrdx9jln61pp8y5"; + rev = "v0.0.1"; + hash = "sha256-xncUButV2/FSOPNolbrZuPPSC1FOtgrlZBwzHHPKCTo="; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 7637b8d34ef2..adeaafad817c 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -552,7 +552,7 @@ https://github.com/KeitaNakamura/neodark.vim/,, https://github.com/folke/neodev.nvim/,HEAD, https://github.com/sbdchd/neoformat/,, https://github.com/danymat/neogen/,HEAD, -https://github.com/NeogitOrg/neogit/,, +https://github.com/NeogitOrg/neogit/,v0.0.1, https://github.com/Shougo/neoinclude.vim/,, https://github.com/neomake/neomake/,, https://github.com/Shougo/neomru.vim/,, From 0bf95267b3592ffc44060c501015f4665d349c99 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Mon, 3 Jun 2024 19:30:21 +0800 Subject: [PATCH 09/22] hn-text: init at 0.1.4 Co-authored-by: Zebreus (cherry picked from commit 069a42726adccb2a72ba7900aa9a4525bfd85e21) --- pkgs/by-name/hn/hn-text/package.nix | 35 +++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/hn/hn-text/package.nix diff --git a/pkgs/by-name/hn/hn-text/package.nix b/pkgs/by-name/hn/hn-text/package.nix new file mode 100644 index 000000000000..e07f31a34230 --- /dev/null +++ b/pkgs/by-name/hn/hn-text/package.nix @@ -0,0 +1,35 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule rec { + pname = "hn-text"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "piqoni"; + repo = "hn-text"; + rev = "v${version}"; + hash = "sha256-YoPdYuNlWrLITyd2XeCOeGy70Ews1rvtOQzYZAQTI+Y="; + }; + + vendorHash = "sha256-lhghteKspXK1WSZ3dVHaTgx2BRx9S7yGNbvRYZKeA+s="; + + ldflags = [ + "-s" + "-w" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Fast, easy-to-use and distraction-free Hacker News terminal client"; + homepage = "https://github.com/piqoni/hn-text"; + license = lib.licenses.mit; + mainProgram = "hn-text"; + maintainers = with lib.maintainers; [ Guanran928 ]; + }; +} From 633f718170f0692385bca7ea85006a12df9d13cf Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 15 Jun 2024 12:20:20 +0200 Subject: [PATCH 10/22] iniparser: 4.1 -> 4.2.3 Fixes CVE-2023-33461 (and several buffer overflows from what I can see in the changes). Project is now maintained on GitLab.com. Changes: https://gitlab.com/iniparser/iniparser/-/releases/v4.2.3 https://gitlab.com/iniparser/iniparser/-/releases/v4.2.2 https://gitlab.com/iniparser/iniparser/-/releases/v4.2.1 https://gitlab.com/iniparser/iniparser/-/releases/v4.2.0 (cherry picked from commit 3d44176ec8df49433f1e8e0ee0e437319fe52dac) --- .../go-package/deepin-pw-check/default.nix | 4 +- .../libraries/iniparser/default.nix | 98 ++++++++++++------- .../libraries/iniparser/iniparser.pc.in | 12 --- .../libraries/iniparser/no-usr.patch | 13 --- .../iniparser/remove-fetchcontent-usage.patch | 17 ++++ 5 files changed, 82 insertions(+), 62 deletions(-) delete mode 100644 pkgs/development/libraries/iniparser/iniparser.pc.in delete mode 100644 pkgs/development/libraries/iniparser/no-usr.patch create mode 100644 pkgs/development/libraries/iniparser/remove-fetchcontent-usage.patch diff --git a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix index d01c45c654d2..fd50f71ac201 100644 --- a/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix +++ b/pkgs/desktops/deepin/go-package/deepin-pw-check/default.nix @@ -41,9 +41,9 @@ buildGoModule rec { ]; postPatch = '' - sed -i 's|iniparser/||' */*.c + sed -i '1i#include \n#include ' tool/pwd_conf_update.c substituteInPlace misc/{pkgconfig/libdeepin_pw_check.pc,system-services/org.deepin.dde.PasswdConf1.service} \ - --replace "/usr" "$out" + --replace-fail "/usr" "$out" ''; buildPhase = '' diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix index 62deaeb1c281..18057753efbd 100644 --- a/pkgs/development/libraries/iniparser/default.nix +++ b/pkgs/development/libraries/iniparser/default.nix @@ -1,51 +1,79 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitLab +, fetchpatch +, fetchFromGitHub +, substituteAll +, symlinkJoin +, cmake +, doxygen +, ruby +, validatePkgConfig +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "iniparser"; - version = "4.1"; + version = "4.2.3"; - src = fetchFromGitHub { - owner = "ndevilla"; + src = fetchFromGitLab { + owner = "iniparser"; repo = "iniparser"; - rev = "v${version}"; - sha256 = "0dhab6pad6wh816lr7r3jb6z273njlgw2vpw8kcfnmi7ijaqhnr5"; + rev = "v${finalAttrs.version}"; + hash = "sha256-rCp9whYPYmVd7saVFILmpdn041u6fYGqe1/Oqc7RaeA="; }; - patches = ./no-usr.patch; + patches = [ + (fetchpatch { + name = "fix-paths-pkgconfig-file.patch"; + url = "https://gitlab.com/iniparser/iniparser/-/commit/6a76cd5e97b32014b22d87039bf6f4ee425c79a2.patch"; + hash = "sha256-KlTxeOzwBZiLNmuwbbem5c/xspxsflyYfeUaQnGyarI="; + }) + ] ++ lib.optionals finalAttrs.doCheck [ + (substituteAll { + # Do not let cmake's fetchContent download unity + src = ./remove-fetchcontent-usage.patch; + unitySrc = symlinkJoin { + name = "unity-with-iniparser-config"; + paths = [ + (fetchFromGitHub { + owner = "throwtheswitch"; + repo = "unity"; + rev = "v2.6.0"; + hash = "sha256-SCcUGNN/UJlu3ALJiZ9bQKxYRZey3cm9QG+NOehp6Ow="; + }) + ]; + postBuild = '' + ln -s ${finalAttrs.src}/test/unity_config.h $out/src/unity_config.h + ''; + }; + }) + ]; - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile \ - --replace -Wl,-soname= -Wl,-install_name, + nativeBuildInputs = [ cmake doxygen validatePkgConfig ] ++ lib.optionals finalAttrs.doCheck [ ruby ]; + + cmakeFlags = [ + "-DBUILD_TESTING=${if finalAttrs.doCheck then "ON" else "OFF"}" + ]; + + doCheck = false; + + postFixup = '' + ln -sv $out/include/iniparser/*.h $out/include/ ''; - doCheck = true; - preCheck = "patchShebangs test/make-tests.sh"; - - installPhase = '' - mkdir -p $out/lib - - mkdir -p $out/include - cp src/*.h $out/include - - mkdir -p $out/share/doc/${pname}-${version} - for i in AUTHORS INSTALL LICENSE README.md; do - bzip2 -c -9 $i > $out/share/doc/${pname}-${version}/$i.bz2; - done; - cp -r html $out/share/doc/${pname}-${version} - - cp libiniparser.a $out/lib - cp libiniparser.so.1 $out/lib - ln -s libiniparser.so.1 $out/lib/libiniparser.so - - mkdir -p $out/lib/pkgconfig - substituteAll ${./iniparser.pc.in} $out/lib/pkgconfig/iniparser.pc - ''; + passthru.tests = { + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + iniparser-with-tests = finalAttrs.overrideAttrs (_: { doCheck = true; }); + }; meta = with lib; { - inherit (src.meta) homepage; + homepage = "https://gitlab.com/iniparser/iniparser"; description = "Free standalone ini file parsing library"; + changelog = "https://gitlab.com/iniparser/iniparser/-/releases/v${finalAttrs.version}"; license = licenses.mit; platforms = platforms.unix; + pkgConfigModules = [ "iniparser" ]; maintainers = [ maintainers.primeos ]; }; -} +}) diff --git a/pkgs/development/libraries/iniparser/iniparser.pc.in b/pkgs/development/libraries/iniparser/iniparser.pc.in deleted file mode 100644 index fb94188fff71..000000000000 --- a/pkgs/development/libraries/iniparser/iniparser.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@out@ -exec_prefix=@out@ -libdir=${exec_prefix}/lib -includedir=${prefix}/include -datarootdir=${prefix}/share -datadir=${datarootdir} - -Name: libiniparser -Description: Iniparser library -Version: @version@ -Libs: -L${libdir} -liniparser -Cflags: -I${includedir} diff --git a/pkgs/development/libraries/iniparser/no-usr.patch b/pkgs/development/libraries/iniparser/no-usr.patch deleted file mode 100644 index a3c568cdde43..000000000000 --- a/pkgs/development/libraries/iniparser/no-usr.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Makefile 2017-10-20 20:30:41.494608284 +0200 -+++ b/Makefile 2017-10-20 20:33:22.279212026 +0200 -@@ -20,8 +20,8 @@ - ARFLAGS = rcv - - SHLD = ${CC} ${CFLAGS} --LDSHFLAGS = -shared -Wl,-Bsymbolic --LDFLAGS += -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib -+LDSHFLAGS = -shared -+LDFLAGS = - - # .so.0 is for version 3.x, .so.1 is 4.x - SO_TARGET ?= libiniparser.so.1 diff --git a/pkgs/development/libraries/iniparser/remove-fetchcontent-usage.patch b/pkgs/development/libraries/iniparser/remove-fetchcontent-usage.patch new file mode 100644 index 000000000000..db96c37e6b2c --- /dev/null +++ b/pkgs/development/libraries/iniparser/remove-fetchcontent-usage.patch @@ -0,0 +1,17 @@ +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index b28d151..33a6bcf 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -28,10 +28,8 @@ set(FETCHCONTENT_QUIET OFF) + + FetchContent_Declare( + unity +- GIT_REPOSITORY "https://github.com/throwtheswitch/unity.git" +- GIT_PROGRESS TRUE +- PATCH_COMMAND ${CMAKE_COMMAND} -E copy +- ${CMAKE_CURRENT_LIST_DIR}/unity_config.h ./src/) ++ SOURCE_DIR @unitySrc@ ++) + + FetchContent_MakeAvailable(unity) + target_compile_definitions(unity PUBLIC UNITY_INCLUDE_CONFIG_H) From ad9bae5933268eeda15355c78c778a9705b995e6 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Thu, 13 Jun 2024 21:31:28 +0200 Subject: [PATCH 11/22] linux_xanmod: 6.6.32 -> 6.6.33 (cherry picked from commit 2deba58dd8a4960be3d6a10f3c29ba54e65c8f15) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 545bb02e95ec..ebcbd0264849 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -6,8 +6,8 @@ let # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit ltsVariant = { - version = "6.6.32"; - hash = "sha256-DdBkfDq+bed1WdaAtxX16xjZO10jjqJ74ccY9Wq6ryM="; + version = "6.6.33"; + hash = "sha256-3qGxIYNVm2f69rym0Ya1X497G7yRNj3lLCtVgyEZ9yw="; variant = "lts"; }; From 3e06a73ea1eb028e3b6b5188096dbb142c521114 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Thu, 13 Jun 2024 21:31:50 +0200 Subject: [PATCH 12/22] linux_xanmod: 6.8.11 -> 6.9.4 (cherry picked from commit 81c471044048c3a67b6bd6e46cb96fb46ee13b8c) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index ebcbd0264849..a34f40c83061 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -12,8 +12,8 @@ let }; mainVariant = { - version = "6.8.11"; - hash = "sha256-nEAUw7qFXab7J6x8coSsoB2meeOX4TQver2WztkFJJI="; + version = "6.9.4"; + hash = "sha256-gY0t77aPWOuRZFESNp0OLIsjLAv+rf0NHbab9WF2VtA="; variant = "main"; }; From d2aaf4da717e75d87b3f18fe24d8d6097a0f124c Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Thu, 13 Jun 2024 21:31:55 +0200 Subject: [PATCH 13/22] xanmod-kernels: enable RCU_BOOST and RCU_EXP_KTHREAD follows commit https://gitlab.com/xanmod/linux/-/commit/0be69880f250f6a498eed3ad709d384457c7f5c8 (cherry picked from commit 7697d0de1d8092bac622c2398dd1fc44eccc9ad5) --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index a34f40c83061..8a60abae111f 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -45,6 +45,14 @@ let HZ = freeform "250"; HZ_250 = yes; HZ_1000 = no; + + # RCU_BOOST and RCU_EXP_KTHREAD + RCU_EXPERT = yes; + RCU_FANOUT = freeform "64"; + RCU_FANOUT_LEAF = freeform "16"; + RCU_BOOST = yes; + RCU_BOOST_DELAY = freeform "0"; + RCU_EXP_KTHREAD = yes; }; extraMeta = { From 519b7ce8feef259e03c446a1c2654fdbef6db868 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 15 Jun 2024 22:31:47 +0000 Subject: [PATCH 14/22] renode: 1.15.0 -> 1.15.1 (cherry picked from commit c732a998e157049400e258f6dfdfc2e759f574f3) --- pkgs/by-name/re/renode/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/renode/package.nix b/pkgs/by-name/re/renode/package.nix index 0a514587f838..c296d7c85967 100644 --- a/pkgs/by-name/re/renode/package.nix +++ b/pkgs/by-name/re/renode/package.nix @@ -31,11 +31,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "renode"; - version = "1.15.0"; + version = "1.15.1"; src = fetchurl { url = "https://github.com/renode/renode/releases/download/v${finalAttrs.version}/renode-${finalAttrs.version}.linux-portable.tar.gz"; - hash = "sha256-w3HKYctW1LmiAse/27Y1Gmz9hDprQ1CK7+TXIexCrkg="; + hash = "sha256-W+JtyaXcYZD+iaVEFX6eatxV3/Vr4aZrsCLm1Aj+ISs="; }; nativeBuildInputs = [ From d7ffe1df698e3cbdb9763927f5714d896328d452 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jun 2024 13:53:47 +0000 Subject: [PATCH 15/22] mdbook-i18n-helpers: 0.3.3 -> 0.3.4 (cherry picked from commit d4b529b19b42fb519230860ac74cad55a9737c5d) --- pkgs/tools/text/mdbook-i18n-helpers/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook-i18n-helpers/default.nix b/pkgs/tools/text/mdbook-i18n-helpers/default.nix index 96026213f4a8..f9343e163798 100644 --- a/pkgs/tools/text/mdbook-i18n-helpers/default.nix +++ b/pkgs/tools/text/mdbook-i18n-helpers/default.nix @@ -5,17 +5,17 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-i18n-helpers"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "google"; repo = "mdbook-i18n-helpers"; # TODO fix once upstream uses semver for tags again rev = "refs/tags/mdbook-i18n-helpers-${version}"; - hash = "sha256-5DfQCkNilRB309BXQ/DWrSMX+A64uiZ2CZxPZ0krtys="; + hash = "sha256-nIavOBWPyCmCLwPcDbjjG1sa71HObGnhms9sSCAR2iA="; }; - cargoHash = "sha256-BrbEW5PD7n9KDaBUjdF60nto6mcfdQ0OUDKcnRH23DA="; + cargoHash = "sha256-bBUgsZHvJPwsdM3DjhaoAvIkPXQ6gzPOdfcE5rAnMQk="; meta = with lib; { description = "Helpers for a mdbook i18n workflow based on Gettext"; From 71004159f4ad9a64b05b2fd54bcaf18e61c8850b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 16 Jun 2024 19:13:47 +0200 Subject: [PATCH 16/22] nixos/oauth2-proxy: restart service when keyFile option changes (cherry picked from commit 0b30b27e1b01bf008d7648499593f6e283b5f2c3) --- nixos/modules/services/security/oauth2-proxy.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/security/oauth2-proxy.nix b/nixos/modules/services/security/oauth2-proxy.nix index 3079a1d030c5..a897f04ea633 100644 --- a/nixos/modules/services/security/oauth2-proxy.nix +++ b/nixos/modules/services/security/oauth2-proxy.nix @@ -586,11 +586,11 @@ in wantedBy = [ "multi-user.target" ]; wants = [ "network-online.target" ] ++ lib.optionals needsKeycloak [ "keycloak.service" ]; after = [ "network-online.target" ] ++ lib.optionals needsKeycloak [ "keycloak.service" ]; - + restartTriggers = [ cfg.keyFile ]; serviceConfig = { User = "oauth2-proxy"; Restart = "always"; - ExecStart = "${cfg.package}/bin/oauth2-proxy ${configString}"; + ExecStart = "${lib.getExe cfg.package} ${configString}"; EnvironmentFile = lib.mkIf (cfg.keyFile != null) cfg.keyFile; }; }; From 4c00883c82de6841d5c102724e275d96b59e41a5 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 15 Jun 2024 14:56:35 +0200 Subject: [PATCH 17/22] rubyPackages.rails: 7.1.3.2 -> 7.1.3.4 Fixes CVE-2024-32464 and CVE-2024-28103. Changes: https://github.com/rails/rails/releases/tag/v7.1.3.4 https://github.com/rails/rails/releases/tag/v7.1.3.3 (cherry picked from commit e6af677352d4e59e194786420a00989485f202b7) --- pkgs/top-level/ruby-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 18819de3029c..e35b4cfb77ec 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -2872,10 +2872,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "185zq5r9g56sfks852992bm0xf2vm9569jyiz5jyww3vx1jply1d"; + sha256 = "sha256-On/KnfdO5kHcHom4MCrG0D8iiD3nceeGoOnzCU5apq0="; type = "gem"; }; - version = "7.1.3.2"; + version = "7.1.3.4"; }; rails-dom-testing = { dependencies = ["activesupport" "minitest" "nokogiri"]; From c029a8718179d104655656a05ad49804de00860c Mon Sep 17 00:00:00 2001 From: Vika Date: Mon, 27 May 2024 21:10:26 +0300 Subject: [PATCH 18/22] sftpgo: mark as unfreeRedistributable Resolves #315154. New Web UI uses an unfree web theme, and as a result it... > is allowed for use only within the SFTPGo product and therefore > cannot be used in derivative works/products without an explicit > grant from the SFTPGo Team (support@sftpgo.com). This makes the entire package unfree, which the [SFTPGo license compliance page][1] supports: > If you modify SFTPGo's source code and are therefore creating a > derivative work: > > 1. ... > 2. ... > 3. You cannot use the UI theme based on KeenThemes because it is > based on a proprietary theme that we purchased and the WebAdmin and > WebClient components created using this theme can only be used only > within SFTPGo and not in derivative works. You must develop and > maintain your own UI components or adapt the WebAdmin/WebClient > included in SFTPGo up to version 2.5.6. @JohnRTitor noted that building from source might not be derivative work, therefore marking as `unfreeRedistributable`. [1]: https://sftpgo.com/compliance.html Co-authored-by: Masum Reza (cherry picked from commit bd887df3f2f56d32fdb0340e6e7210d64e64bc32) --- pkgs/servers/sftpgo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sftpgo/default.nix b/pkgs/servers/sftpgo/default.nix index 9e7f1b6b456c..8330b5cff97d 100644 --- a/pkgs/servers/sftpgo/default.nix +++ b/pkgs/servers/sftpgo/default.nix @@ -58,7 +58,7 @@ buildGoModule rec { local filesystem, encrypted local filesystem, S3 (compatible) Object Storage, Google Cloud Storage, Azure Blob Storage, SFTP. ''; - license = licenses.agpl3Only; + license = with licenses; [ agpl3Only unfreeRedistributable ]; # Software is AGPLv3, web UI is unfree maintainers = with maintainers; [ thenonameguy yayayayaka ]; mainProgram = "sftpgo"; }; From 54174e9f0ce5a96528a59b40f4b000ad0d71b8e4 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 10 Jun 2024 14:11:36 +0200 Subject: [PATCH 19/22] compcert: add support for Coq 8.19.2 (cherry picked from commit 4ec26ff3d46ee4ad2844f358fc89709b38ae442a) --- pkgs/development/coq-modules/VST/default.nix | 2 +- pkgs/development/coq-modules/compcert/default.nix | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/VST/default.nix b/pkgs/development/coq-modules/VST/default.nix index 706d11786354..8cfe5e9f764e 100644 --- a/pkgs/development/coq-modules/VST/default.nix +++ b/pkgs/development/coq-modules/VST/default.nix @@ -43,7 +43,7 @@ mkCoqDerivation { preConfigure = '' patchShebangs util substituteInPlace Makefile \ - --replace 'COQVERSION= ' 'COQVERSION= 8.17.1 or-else 8.16.1 or-else 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\ + --replace 'COQVERSION= ' 'COQVERSION= 8.19.2 or-else 8.17.1 or-else 8.16.1 or-else 8.16.0 or-else 8.15.2 or-else 8.15.1 or-else '\ --replace 'FLOYD_FILES=' 'FLOYD_FILES= ${toString extra_floyd_files}' ''; diff --git a/pkgs/development/coq-modules/compcert/default.nix b/pkgs/development/coq-modules/compcert/default.nix index 0557311c3650..0bbce6b0ce87 100644 --- a/pkgs/development/coq-modules/compcert/default.nix +++ b/pkgs/development/coq-modules/compcert/default.nix @@ -193,6 +193,20 @@ compcert.overrideAttrs (o: url = "https://github.com/AbsInt/CompCert/commit/a2e4ed62fc558d565366845f9d135bd7db5e23c4.patch"; hash = "sha256-ufk0bokuayLfkSvK3cK4E9iXU5eZpp9d/ETSa/zCfMg="; }) + # Support for Coq 8.19.2 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/8fcfb7d2a6e9ba44003ccab0dfcc894982779af1.patch"; + hash = "sha256-m/kcnDBBPWFriipuGvKZUqLQU8/W1uqw8j4qfCwnTZk="; + }) + ]; + } + { cases = [ (isEq "8.19") (isEq "3.14") ]; + out = [ + # Support for Coq 8.19.2 + (fetchpatch { + url = "https://github.com/AbsInt/CompCert/commit/8fcfb7d2a6e9ba44003ccab0dfcc894982779af1.patch"; + hash = "sha256-m/kcnDBBPWFriipuGvKZUqLQU8/W1uqw8j4qfCwnTZk="; + }) ]; } ] []; From 64218fcf50fc7100c93f0708cc2097f75aa879cb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 10 Jun 2024 13:52:04 +0200 Subject: [PATCH 20/22] =?UTF-8?q?coq:=208.19.1=20=E2=86=92=208.19.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 10c6fb3db4dbbdeffa0c601c5f1d245c9c066d86) --- pkgs/applications/science/logic/coq/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 68b424b32fb4..af672d500fa6 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -58,6 +58,7 @@ let "8.18.0".sha256 = "sha256-WhiBs4nzPHQ0R24xAdM49kmxSCPOxiOVMA1iiMYunz4="; "8.19.0".sha256 = "sha256-ixsYCvCXpBHqJ71hLQklphlwoOO3i/6w2PJjllKqf9k="; "8.19.1".sha256 = "sha256-kmZ8Uk8jpzjOd67aAPp3C+vU2oNaBw9pr7+Uixcgg94="; + "8.19.2".sha256 = "sha256-q+i07JsMZp83Gqav6v1jxsgPLN7sPvp5/oszVnavmz0="; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix From da2ffb30b69802f57a6da14c5bad90ffbc691f65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Jun 2024 16:45:33 +0000 Subject: [PATCH 21/22] xplr: 0.21.8 -> 0.21.9 (cherry picked from commit f24d7e64a5e577884e8de5d729ab9f5e2d776118) --- pkgs/by-name/xp/xplr/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xp/xplr/package.nix b/pkgs/by-name/xp/xplr/package.nix index 920ddb872032..54dcedcf720c 100644 --- a/pkgs/by-name/xp/xplr/package.nix +++ b/pkgs/by-name/xp/xplr/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.21.8"; + version = "0.21.9"; src = fetchFromGitHub { owner = "sayanarijit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GpGYCGXSCQhFEPDUnHaOdz0LZ0jjRcCRnRCyOrulDVs="; + sha256 = "sha256-0c2QJUEQwKEzzDBDP5XdX7xe1rivazsoZtepB4Dxp/c="; }; - cargoHash = "sha256-eCIoUUWHpFk+O5ipswwiQxf1H1ygkj07Sjyj4L8Ui6I="; + cargoHash = "sha256-RZgdWhVBZozYxbbNslCBLhN6EnogpyVXvht6GbzLnPs="; # fixes `thread 'main' panicked at 'cannot find strip'` on x86_64-darwin env = lib.optionalAttrs (stdenv.isx86_64 && stdenv.isDarwin) { From 2af0462f7f637a36e1ab0478259478a039a91d52 Mon Sep 17 00:00:00 2001 From: fanquake Date: Mon, 17 Jun 2024 16:37:56 +0100 Subject: [PATCH 22/22] bitcoin: 27.0 -> 27.1 (cherry picked from commit d6e9159112b3f5a8a25edecf5325dade3e982104) --- pkgs/applications/blockchains/bitcoin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 7385d4bd9c45..7e995ad60a8c 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -33,14 +33,14 @@ let in stdenv.mkDerivation rec { pname = if withGui then "bitcoin" else "bitcoind"; - version = "27.0"; + version = "27.1"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; # hash retrieved from signed SHA256SUMS - sha256 = "9c1ee651d3b157baccc3388be28b8cf3bfcefcd2493b943725ad6040ca6b146b"; + sha256 = "0c1051fd921b8fae912f5c2dfd86b085ab45baa05cd7be4585b10b4d1818f3da"; }; nativeBuildInputs =