From 617a1a6e5778df81efceffa656988e38bd293b1c Mon Sep 17 00:00:00 2001 From: Eli Kogan-Wang Date: Thu, 12 Sep 2024 17:01:07 +0200 Subject: [PATCH 001/108] nixos-rebuild.sh: pass flags to nix-copy-closure whenever possible --- .../linux/nixos-rebuild/nixos-rebuild.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 957f03c5fc8e..515c30c7d7d4 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -102,21 +102,32 @@ while [ "$#" -gt 0 ]; do --use-substitutes|--substitute-on-destination|-s) copyFlags+=("-s") ;; - -I|--max-jobs|-j|--cores|--builders|--log-format) + --builders) j="$1"; shift 1 extraBuildFlags+=("$i" "$j") ;; - --accept-flake-config|-j*|--quiet|--print-build-logs|-L|--no-build-output|-Q| --show-trace|--keep-going|-k|--keep-failed|-K|--fallback|--refresh|--repair|--impure|--offline|--no-net) + --I|--max-jobs|-j|--cores|--log-format) + j="$1"; shift 1 + extraBuildFlags+=("$i" "$j") + copyFlags+=("$i" "$j") + ;; + --accept-flake-config|-j*|--quiet|--print-build-logs|-L|--no-build-output|-Q|--show-trace|--refresh|--impure|--offline|--no-net) extraBuildFlags+=("$i") ;; + --keep-going|-k|--keep-failed|-K|--fallback|--repair) + extraBuildFlags+=("$i") + copyFlags+=("$i") + ;; --verbose|-v|-vv|-vvv|-vvvv|-vvvvv) verboseScript="true" extraBuildFlags+=("$i") + copyFlags+=("$i") ;; --option) j="$1"; shift 1 k="$1"; shift 1 extraBuildFlags+=("$i" "$j" "$k") + copyFlags+=("$i" "$j" "$k") ;; --fast) buildNix= From 4912d0b79be1f6bebbee44788e3582465df8ce4a Mon Sep 17 00:00:00 2001 From: ocfox Date: Fri, 27 Sep 2024 12:42:37 +0800 Subject: [PATCH 002/108] yofi: fix build --- pkgs/by-name/yo/yofi/package.nix | 36 ++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/yo/yofi/package.nix b/pkgs/by-name/yo/yofi/package.nix index 5fa38d280aef..5494c8369d24 100644 --- a/pkgs/by-name/yo/yofi/package.nix +++ b/pkgs/by-name/yo/yofi/package.nix @@ -1,12 +1,14 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, autoPatchelfHook -, fontconfig -, libxkbcommon -, pkg-config -, libgcc -, wayland +{ + lib, + fetchFromGitHub, + fetchpatch, + rustPlatform, + autoPatchelfHook, + fontconfig, + libxkbcommon, + pkg-config, + libgcc, + wayland, }: rustPlatform.buildRustPackage rec { pname = "yofi"; @@ -19,7 +21,16 @@ rustPlatform.buildRustPackage rec { hash = "sha256-cepAZyA4RBgqeF20g6YOlZTM0aRqErw17yuQ3U24UEg="; }; - cargoHash = "sha256-iSy/y1iwhR8x3wDIfazMeROSrJ8uRyA10hoNo6y2OQc="; + cargoPatches = [ + (fetchpatch { + name = "bump-time-1.80.0.patch"; + url = "https://github.com/l4l/yofi/commit/438e180bf5132d29a6846e830d7227cb996ade3e.patch"; + hash = "sha256-o/kwQRIG6MASGYnepb96pL1qfI+/CNTqc5maDPjSZXk="; + }) + ]; + + cargoHash = "sha256-GA6rFet0GIYFR/8WsWteMDwVRz/KyyxlFQOz/lNX7Rk="; + nativeBuildInputs = [ autoPatchelfHook pkg-config @@ -31,7 +42,10 @@ rustPlatform.buildRustPackage rec { ]; appendRunpaths = [ - (lib.makeLibraryPath [ fontconfig wayland ]) + (lib.makeLibraryPath [ + fontconfig + wayland + ]) ]; checkFlags = [ From 15d355a6ee47890424969f4778f71785710d8158 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 28 Sep 2024 10:01:50 +0800 Subject: [PATCH 003/108] fcp: move to by-name; nixfmt --- .../fc/fcp/package.nix} | 20 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 13 insertions(+), 9 deletions(-) rename pkgs/{tools/misc/fcp/default.nix => by-name/fc/fcp/package.nix} (73%) diff --git a/pkgs/tools/misc/fcp/default.nix b/pkgs/by-name/fc/fcp/package.nix similarity index 73% rename from pkgs/tools/misc/fcp/default.nix rename to pkgs/by-name/fc/fcp/package.nix index 9d3a7c4074fe..3e0096e7c62e 100644 --- a/pkgs/tools/misc/fcp/default.nix +++ b/pkgs/by-name/fc/fcp/package.nix @@ -1,4 +1,10 @@ -{ expect, fetchFromGitHub, lib, rustPlatform, stdenv }: +{ + expect, + fetchFromGitHub, + lib, + rustPlatform, + stdenv, +}: rustPlatform.buildRustPackage rec { pname = "fcp"; @@ -6,8 +12,8 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "svetlitski"; - repo = pname; - rev = "v${version}"; + repo = "fcp"; + rev = "refs/tags/v${version}"; sha256 = "0f242n8w88rikg1srimdifadhggrb2r1z0g65id60ahb4bjm8a0x"; }; @@ -22,13 +28,13 @@ rustPlatform.buildRustPackage rec { patchShebangs tests/*.exp ''; - meta = with lib; { + meta = { description = "Significantly faster alternative to the classic Unix cp(1) command"; homepage = "https://github.com/svetlitski/fcp"; changelog = "https://github.com/svetlitski/fcp/releases/tag/v${version}"; - license = licenses.bsd3; - platforms = platforms.unix; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "fcp"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05c5985bd5c9..3348cd9f3988 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29636,8 +29636,6 @@ with pkgs; fclones-gui = darwin.apple_sdk_11_0.callPackage ../tools/misc/fclones/gui.nix { }; - fcp = callPackage ../tools/misc/fcp { }; - fdupes = callPackage ../tools/misc/fdupes { }; feh = callPackage ../applications/graphics/feh { From 88a0de19432ed1dd5ac372e761801f73079cfa47 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 28 Sep 2024 10:14:31 +0800 Subject: [PATCH 004/108] fcp: fix build --- .../fc/fcp/0001-update-Cargo.lock.patch | 889 ++++++++++++++++++ pkgs/by-name/fc/fcp/package.nix | 15 +- 2 files changed, 903 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/fc/fcp/0001-update-Cargo.lock.patch diff --git a/pkgs/by-name/fc/fcp/0001-update-Cargo.lock.patch b/pkgs/by-name/fc/fcp/0001-update-Cargo.lock.patch new file mode 100644 index 000000000000..0119e5c20adf --- /dev/null +++ b/pkgs/by-name/fc/fcp/0001-update-Cargo.lock.patch @@ -0,0 +1,889 @@ +From ffb3ab5b45301a7848ccd53ab077e37d0e8382c3 Mon Sep 17 00:00:00 2001 +From: wxt <3264117476@qq.com> +Date: Sat, 28 Sep 2024 10:09:27 +0800 +Subject: [PATCH] update Cargo.lock + +--- + Cargo.lock | 465 +++++++++++++++++++++++++++++------------------------ + 1 file changed, 254 insertions(+), 211 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 6829f6f..8ae6c05 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -2,6 +2,15 @@ + # It is not intended for manual editing. + version = 3 + ++[[package]] ++name = "aho-corasick" ++version = "1.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" ++dependencies = [ ++ "memchr", ++] ++ + [[package]] + name = "atty" + version = "0.2.14" +@@ -15,48 +24,42 @@ dependencies = [ + + [[package]] + name = "autocfg" +-version = "1.0.1" ++version = "1.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" ++checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + + [[package]] + name = "bitflags" +-version = "1.2.1" ++version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + + [[package]] +-name = "bstr" +-version = "0.2.16" ++name = "bumpalo" ++version = "3.16.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279" +-dependencies = [ +- "lazy_static", +- "memchr", +- "regex-automata", +- "serde", +-] ++checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + + [[package]] +-name = "bumpalo" +-version = "3.7.0" ++name = "byteorder" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" ++checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + + [[package]] + name = "cast" +-version = "0.2.7" ++version = "0.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a" +-dependencies = [ +- "rustc_version", +-] ++checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + + [[package]] + name = "cc" +-version = "1.0.69" ++version = "1.1.22" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" ++checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0" ++dependencies = [ ++ "shlex", ++] + + [[package]] + name = "cfg-if" +@@ -66,9 +69,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + + [[package]] + name = "clap" +-version = "2.33.3" ++version = "2.34.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" ++checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" + dependencies = [ + "bitflags", + "textwrap", +@@ -77,16 +80,16 @@ dependencies = [ + + [[package]] + name = "criterion" +-version = "0.3.4" ++version = "0.3.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23" ++checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" + dependencies = [ + "atty", + "cast", + "clap", + "criterion-plot", + "csv", +- "itertools 0.10.1", ++ "itertools", + "lazy_static", + "num-traits", + "oorandom", +@@ -103,65 +106,45 @@ dependencies = [ + + [[package]] + name = "criterion-plot" +-version = "0.4.3" ++version = "0.4.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d" ++checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" + dependencies = [ + "cast", +- "itertools 0.9.0", +-] +- +-[[package]] +-name = "crossbeam-channel" +-version = "0.5.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +-dependencies = [ +- "cfg-if", +- "crossbeam-utils", ++ "itertools", + ] + + [[package]] + name = "crossbeam-deque" +-version = "0.8.0" ++version = "0.8.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" ++checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" + dependencies = [ +- "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", + ] + + [[package]] + name = "crossbeam-epoch" +-version = "0.9.5" ++version = "0.9.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" ++checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" + dependencies = [ +- "cfg-if", + "crossbeam-utils", +- "lazy_static", +- "memoffset", +- "scopeguard", + ] + + [[package]] + name = "crossbeam-utils" +-version = "0.8.5" ++version = "0.8.20" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +-dependencies = [ +- "cfg-if", +- "lazy_static", +-] ++checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + + [[package]] + name = "csv" +-version = "1.1.6" ++version = "1.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" ++checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" + dependencies = [ +- "bstr", + "csv-core", + "itoa", + "ryu", +@@ -170,9 +153,9 @@ dependencies = [ + + [[package]] + name = "csv-core" +-version = "0.1.10" ++version = "0.1.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" ++checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" + dependencies = [ + "memchr", + ] +@@ -192,9 +175,9 @@ dependencies = [ + + [[package]] + name = "either" +-version = "1.6.1" ++version = "1.13.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" ++checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" + + [[package]] + name = "fcp" +@@ -208,9 +191,9 @@ dependencies = [ + + [[package]] + name = "getrandom" +-version = "0.2.3" ++version = "0.2.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" ++checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" + dependencies = [ + "cfg-if", + "libc", +@@ -219,9 +202,9 @@ dependencies = [ + + [[package]] + name = "half" +-version = "1.7.1" ++version = "1.8.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3" ++checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" + + [[package]] + name = "hermit-abi" +@@ -234,78 +217,66 @@ dependencies = [ + + [[package]] + name = "itertools" +-version = "0.9.0" ++version = "0.10.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +-dependencies = [ +- "either", +-] +- +-[[package]] +-name = "itertools" +-version = "0.10.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" ++checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" + dependencies = [ + "either", + ] + + [[package]] + name = "itoa" +-version = "0.4.7" ++version = "1.0.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" ++checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + + [[package]] + name = "js-sys" +-version = "0.3.51" ++version = "0.3.70" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062" ++checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" + dependencies = [ + "wasm-bindgen", + ] + + [[package]] + name = "lazy_static" +-version = "1.4.0" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + + [[package]] + name = "libc" +-version = "0.2.98" ++version = "0.2.159" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790" ++checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" + + [[package]] + name = "log" +-version = "0.4.14" ++version = "0.4.22" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +-dependencies = [ +- "cfg-if", +-] ++checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" + + [[package]] + name = "memchr" +-version = "2.4.0" ++version = "2.7.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" ++checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + + [[package]] + name = "memoffset" +-version = "0.6.4" ++version = "0.6.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" ++checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" + dependencies = [ + "autocfg", + ] + + [[package]] + name = "nix" +-version = "0.22.0" ++version = "0.22.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cf1e25ee6b412c2a1e3fcb6a4499a5c1bfe7f43e014bdce9a6b6666e5aa2d187" ++checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" + dependencies = [ + "bitflags", + "cc", +@@ -316,34 +287,30 @@ dependencies = [ + + [[package]] + name = "num-traits" +-version = "0.2.14" ++version = "0.2.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" ++checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" + dependencies = [ + "autocfg", + ] + + [[package]] +-name = "num_cpus" +-version = "1.13.0" ++name = "once_cell" ++version = "1.19.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +-dependencies = [ +- "hermit-abi", +- "libc", +-] ++checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + + [[package]] + name = "oorandom" +-version = "11.1.3" ++version = "11.1.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" ++checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" + + [[package]] + name = "plotters" +-version = "0.3.1" ++version = "0.3.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a" ++checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" + dependencies = [ + "num-traits", + "plotters-backend", +@@ -354,53 +321,55 @@ dependencies = [ + + [[package]] + name = "plotters-backend" +-version = "0.3.2" ++version = "0.3.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c" ++checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" + + [[package]] + name = "plotters-svg" +-version = "0.3.1" ++version = "0.3.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9" ++checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" + dependencies = [ + "plotters-backend", + ] + + [[package]] + name = "ppv-lite86" +-version = "0.2.10" ++version = "0.2.20" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" ++checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" ++dependencies = [ ++ "zerocopy", ++] + + [[package]] + name = "proc-macro2" +-version = "1.0.27" ++version = "1.0.86" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" + dependencies = [ +- "unicode-xid", ++ "unicode-ident", + ] + + [[package]] + name = "quote" +-version = "1.0.9" ++version = "1.0.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" + dependencies = [ + "proc-macro2", + ] + + [[package]] + name = "rand" +-version = "0.8.4" ++version = "0.8.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" ++checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" + dependencies = [ + "libc", + "rand_chacha", + "rand_core", +- "rand_hc", + ] + + [[package]] +@@ -415,22 +384,13 @@ dependencies = [ + + [[package]] + name = "rand_core" +-version = "0.6.3" ++version = "0.6.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" ++checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" + dependencies = [ + "getrandom", + ] + +-[[package]] +-name = "rand_hc" +-version = "0.3.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" +-dependencies = [ +- "rand_core", +-] +- + [[package]] + name = "rand_pcg" + version = "0.3.1" +@@ -442,64 +402,58 @@ dependencies = [ + + [[package]] + name = "rayon" +-version = "1.5.1" ++version = "1.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" ++checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" + dependencies = [ +- "autocfg", +- "crossbeam-deque", + "either", + "rayon-core", + ] + + [[package]] + name = "rayon-core" +-version = "1.9.1" ++version = "1.12.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" ++checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" + dependencies = [ +- "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", +- "lazy_static", +- "num_cpus", + ] + + [[package]] + name = "regex" +-version = "1.5.4" ++version = "1.10.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" ++checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" + dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-automata", + "regex-syntax", + ] + + [[package]] + name = "regex-automata" +-version = "0.1.10" ++version = "0.4.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" ++checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++] + + [[package]] + name = "regex-syntax" +-version = "0.6.25" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +- +-[[package]] +-name = "rustc_version" +-version = "0.4.0" ++version = "0.8.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +-dependencies = [ +- "semver", +-] ++checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" + + [[package]] + name = "ryu" +-version = "1.0.5" ++version = "1.0.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" ++checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + + [[package]] + name = "same-file" +@@ -510,32 +464,20 @@ dependencies = [ + "winapi-util", + ] + +-[[package]] +-name = "scopeguard" +-version = "1.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +- +-[[package]] +-name = "semver" +-version = "1.0.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5f3aac57ee7f3272d8395c6e4f502f434f0e289fcd62876f70daa008c20dcabe" +- + [[package]] + name = "serde" +-version = "1.0.126" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" ++checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_cbor" +-version = "0.11.1" ++version = "0.11.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622" ++checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" + dependencies = [ + "half", + "serde", +@@ -543,9 +485,9 @@ dependencies = [ + + [[package]] + name = "serde_derive" +-version = "1.0.126" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" ++checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" + dependencies = [ + "proc-macro2", + "quote", +@@ -554,24 +496,31 @@ dependencies = [ + + [[package]] + name = "serde_json" +-version = "1.0.64" ++version = "1.0.128" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" ++checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" + dependencies = [ + "itoa", ++ "memchr", + "ryu", + "serde", + ] + ++[[package]] ++name = "shlex" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" ++ + [[package]] + name = "syn" +-version = "1.0.73" ++version = "2.0.79" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7" ++checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" + dependencies = [ + "proc-macro2", + "quote", +- "unicode-xid", ++ "unicode-ident", + ] + + [[package]] +@@ -594,53 +543,53 @@ dependencies = [ + ] + + [[package]] +-name = "unicode-width" +-version = "0.1.8" ++name = "unicode-ident" ++version = "1.0.13" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" ++checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" + + [[package]] +-name = "unicode-xid" +-version = "0.2.2" ++name = "unicode-width" ++version = "0.1.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" ++checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + + [[package]] + name = "walkdir" +-version = "2.3.2" ++version = "2.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" ++checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" + dependencies = [ + "same-file", +- "winapi", + "winapi-util", + ] + + [[package]] + name = "wasi" +-version = "0.10.2+wasi-snapshot-preview1" ++version = "0.11.0+wasi-snapshot-preview1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" ++checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + + [[package]] + name = "wasm-bindgen" +-version = "0.2.74" ++version = "0.2.93" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd" ++checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" + dependencies = [ + "cfg-if", ++ "once_cell", + "wasm-bindgen-macro", + ] + + [[package]] + name = "wasm-bindgen-backend" +-version = "0.2.74" ++version = "0.2.93" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900" ++checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" + dependencies = [ + "bumpalo", +- "lazy_static", + "log", ++ "once_cell", + "proc-macro2", + "quote", + "syn", +@@ -649,9 +598,9 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro" +-version = "0.2.74" ++version = "0.2.93" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4" ++checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" + dependencies = [ + "quote", + "wasm-bindgen-macro-support", +@@ -659,9 +608,9 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro-support" +-version = "0.2.74" ++version = "0.2.93" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97" ++checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" + dependencies = [ + "proc-macro2", + "quote", +@@ -672,15 +621,15 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-shared" +-version = "0.2.74" ++version = "0.2.93" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f" ++checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" + + [[package]] + name = "web-sys" +-version = "0.3.51" ++version = "0.3.70" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582" ++checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" + dependencies = [ + "js-sys", + "wasm-bindgen", +@@ -704,11 +653,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + + [[package]] + name = "winapi-util" +-version = "0.1.5" ++version = "0.1.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" ++checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" + dependencies = [ +- "winapi", ++ "windows-sys", + ] + + [[package]] +@@ -716,3 +665,97 @@ name = "winapi-x86_64-pc-windows-gnu" + version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++ ++[[package]] ++name = "windows-sys" ++version = "0.59.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" ++dependencies = [ ++ "windows-targets", ++] ++ ++[[package]] ++name = "windows-targets" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" ++dependencies = [ ++ "windows_aarch64_gnullvm", ++ "windows_aarch64_msvc", ++ "windows_i686_gnu", ++ "windows_i686_gnullvm", ++ "windows_i686_msvc", ++ "windows_x86_64_gnu", ++ "windows_x86_64_gnullvm", ++ "windows_x86_64_msvc", ++] ++ ++[[package]] ++name = "windows_aarch64_gnullvm" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" ++ ++[[package]] ++name = "windows_aarch64_msvc" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" ++ ++[[package]] ++name = "windows_i686_gnu" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" ++ ++[[package]] ++name = "windows_i686_gnullvm" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" ++ ++[[package]] ++name = "windows_i686_msvc" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" ++ ++[[package]] ++name = "windows_x86_64_gnu" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" ++ ++[[package]] ++name = "windows_x86_64_gnullvm" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" ++ ++[[package]] ++name = "windows_x86_64_msvc" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" ++ ++[[package]] ++name = "zerocopy" ++version = "0.7.35" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" ++dependencies = [ ++ "byteorder", ++ "zerocopy-derive", ++] ++ ++[[package]] ++name = "zerocopy-derive" ++version = "0.7.35" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] +-- +2.46.0 + diff --git a/pkgs/by-name/fc/fcp/package.nix b/pkgs/by-name/fc/fcp/package.nix index 3e0096e7c62e..e2ca5ee7af93 100644 --- a/pkgs/by-name/fc/fcp/package.nix +++ b/pkgs/by-name/fc/fcp/package.nix @@ -4,6 +4,7 @@ lib, rustPlatform, stdenv, + fetchpatch, }: rustPlatform.buildRustPackage rec { @@ -17,7 +18,19 @@ rustPlatform.buildRustPackage rec { sha256 = "0f242n8w88rikg1srimdifadhggrb2r1z0g65id60ahb4bjm8a0x"; }; - cargoHash = "sha256-iS3H87kTS7Iq0FhHE47zBOozPKC1mG9eHiATxp18hz8="; + cargoPatches = [ + (fetchpatch { + url = "https://github.com/Svetlitski/fcp/commit/1988f88be54a507b804b037cb3887fecf11bb571.patch"; + hash = "sha256-fafpy1tviT1rV+jv1Yxg6xEsFZ9qXWQi5LykagDA5xI="; + }) + (fetchpatch { + url = "https://github.com/Svetlitski/fcp/commit/89bcfc9aa1055dcf541da7a6477ffd3107023f48.patch"; + hash = "sha256-NJ9MMeWf6Ywu+p5uDSWWpAcb01PoMbuSAZ3Qxl9jEaY="; + }) + ./0001-update-Cargo.lock.patch + ]; + + cargoHash = "sha256-wFXvaARflHsT1xz3muC/BPRmhnXEEIk2pBsu87E7Wo8="; nativeBuildInputs = [ expect ]; From e7062a6b066d07a358978487c2509f2b75122f90 Mon Sep 17 00:00:00 2001 From: Konrad Malik Date: Mon, 23 Sep 2024 23:29:11 +0200 Subject: [PATCH 005/108] mise: fix shell completion Replace 'usage' cmd in completion files with nix store path --- pkgs/tools/misc/mise/default.nix | 48 +++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/misc/mise/default.nix b/pkgs/tools/misc/mise/default.nix index ace598e053b7..6964083e631c 100644 --- a/pkgs/tools/misc/mise/default.nix +++ b/pkgs/tools/misc/mise/default.nix @@ -1,18 +1,20 @@ -{ lib -, nix-update-script -, rustPlatform -, fetchFromGitHub -, installShellFiles -, stdenv -, coreutils -, bash -, pkg-config -, openssl -, direnv -, Security -, SystemConfiguration -, mise -, testers +{ + lib, + nix-update-script, + rustPlatform, + fetchFromGitHub, + installShellFiles, + stdenv, + coreutils, + bash, + pkg-config, + openssl, + direnv, + Security, + SystemConfiguration, + usage, + mise, + testers, }: rustPlatform.buildRustPackage rec { @@ -34,8 +36,16 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-jGqaGbue+AEK0YjhHMlm84XBgA20p8Um03TjctjXVz0="; - nativeBuildInputs = [ installShellFiles pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Security + SystemConfiguration + ]; postPatch = '' patchShebangs --build \ @@ -70,6 +80,10 @@ rustPlatform.buildRustPackage rec { postInstall = '' installManPage ./man/man1/mise.1 + substituteInPlace ./completions/{mise.bash,mise.fish,_mise} \ + --replace-fail '-v usage' '-v ${usage}/bin/usage' \ + --replace-fail 'usage complete-word' '${usage}/bin/usage complete-word' + installShellCompletion \ --bash ./completions/mise.bash \ --fish ./completions/mise.fish \ From a2f33a4b895e00d9fd9d0b2b035f1d1103f606f3 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 30 Sep 2024 12:19:54 -0300 Subject: [PATCH 006/108] seabios: nixfmt-rfc-style --- pkgs/by-name/se/seabios/package.nix | 56 +++++++++++++++++------------ 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/se/seabios/package.nix b/pkgs/by-name/se/seabios/package.nix index 713f58702113..9c06b7cf753e 100644 --- a/pkgs/by-name/se/seabios/package.nix +++ b/pkgs/by-name/se/seabios/package.nix @@ -1,9 +1,10 @@ -{ lib -, stdenv -, fetchgit -, acpica-tools -, python3 -, writeText +{ + lib, + acpica-tools, + fetchgit, + python3, + stdenv, + writeText, }: stdenv.mkDerivation (finalAttrs: { @@ -16,7 +17,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-hWemj83cxdY8p+Jhkh5GcPvI0Sy5aKYZJCsKDjHTUUk="; }; - outputs = [ "out" "doc" ]; + outputs = [ + "out" + "doc" + ]; nativeBuildInputs = [ python3 ]; @@ -29,20 +33,28 @@ stdenv.mkDerivation (finalAttrs: { "EXTRAVERSION=\"-nixpkgs\"" ]; - hardeningDisable = [ "pic" "stackprotector" "fortify" ]; + hardeningDisable = [ + "fortify" + "pic" + "stackprotector" + ]; - postConfigure = let - config = writeText "config.txt" (lib.generators.toKeyValue { } { - # SeaBIOS with CSM (Compatible Support Module) support; learn more at - # https://www.electronicshub.org/what-is-csm-bios/ - "CONFIG_CSM" = "y"; - "CONFIG_PERMIT_UNALIGNED_PCIROM" = "y"; - "CONFIG_QEMU_HARDWARE" = "y"; - }); - in '' - cp ${config} .config - make olddefconfig - ''; + postConfigure = + let + config = writeText "config.txt" ( + lib.generators.toKeyValue { } { + # SeaBIOS with CSM (Compatible Support Module) support; learn more at + # https://www.electronicshub.org/what-is-csm-bios/ + "CONFIG_CSM" = "y"; + "CONFIG_PERMIT_UNALIGNED_PCIROM" = "y"; + "CONFIG_QEMU_HARDWARE" = "y"; + } + ); + in + '' + cp ${config} .config + make olddefconfig + ''; installPhase = '' runHook preInstall @@ -64,9 +76,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = with lib.licenses; [ lgpl3Plus ]; maintainers = with lib.maintainers; [ AndersonTorres ]; - platforms = lib.systems.inspect.patternLogicalAnd - lib.systems.inspect.patterns.isUnix - lib.systems.inspect.patterns.isx86; + platforms = lib.systems.inspect.patternLogicalAnd lib.systems.inspect.patterns.isUnix lib.systems.inspect.patterns.isx86; badPlatforms = [ lib.systems.inspect.patterns.isDarwin ]; }; }) From b4e763282a3fd994f20ff515616b1df8c0ef7468 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 30 Sep 2024 12:24:35 -0300 Subject: [PATCH 007/108] seabios: use outputDoc --- pkgs/by-name/se/seabios/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/se/seabios/package.nix b/pkgs/by-name/se/seabios/package.nix index 9c06b7cf753e..992082babeab 100644 --- a/pkgs/by-name/se/seabios/package.nix +++ b/pkgs/by-name/se/seabios/package.nix @@ -59,8 +59,8 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -pv $doc/share/doc/seabios-${finalAttrs.version}/ - cp -v docs/* $doc/share/doc/seabios-${finalAttrs.version}/ + mkdir -pv ''${!outputDoc}/share/doc/seabios-${finalAttrs.version}/ + cp -v docs/* ''${!outputDoc}/share/doc/seabios-${finalAttrs.version}/ install -Dm644 out/Csm16.bin -t $out/share/seabios/ runHook postInstall From 525eebaa3d30267cc52e5f8b731a9d5aa32d9c64 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 30 Sep 2024 12:35:00 -0300 Subject: [PATCH 008/108] seabios: new parameter ___build-type It can assume the values "coreboot", "csm" and "qemu". The triple-underscored kebab-cased format is a poor man's mitigation for the problem of unexpected shadowing. --- pkgs/by-name/se/seabios/package.nix | 31 +++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/se/seabios/package.nix b/pkgs/by-name/se/seabios/package.nix index 992082babeab..0e0fc06aeb16 100644 --- a/pkgs/by-name/se/seabios/package.nix +++ b/pkgs/by-name/se/seabios/package.nix @@ -5,8 +5,33 @@ python3, stdenv, writeText, + # Configurable options + ___build-type ? "csm", }: +assert lib.elem (___build-type) [ + "coreboot" + # SeaBIOS with CSM (Compatible Support Module) support; learn more at + # https://www.electronicshub.org/what-is-csm-bios/ + "csm" + "qemu" +]; +let + biosfile = + { + "coreboot" = "bios.bin.elf"; + "csm" = "Csm16.bin"; + "qemu" = "bios.bin"; + } + .${___build-type}; + configuration-string = + { + "coreboot" = "CONFIG_COREBOOT"; + "csm" = "CONFIG_CSM"; + "qemu" = "CONFIG_QEMU"; + } + .${___build-type}; +in stdenv.mkDerivation (finalAttrs: { pname = "seabios"; version = "1.16.3"; @@ -43,9 +68,7 @@ stdenv.mkDerivation (finalAttrs: { let config = writeText "config.txt" ( lib.generators.toKeyValue { } { - # SeaBIOS with CSM (Compatible Support Module) support; learn more at - # https://www.electronicshub.org/what-is-csm-bios/ - "CONFIG_CSM" = "y"; + "${configuration-string}" = "y"; "CONFIG_PERMIT_UNALIGNED_PCIROM" = "y"; "CONFIG_QEMU_HARDWARE" = "y"; } @@ -61,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -pv ''${!outputDoc}/share/doc/seabios-${finalAttrs.version}/ cp -v docs/* ''${!outputDoc}/share/doc/seabios-${finalAttrs.version}/ - install -Dm644 out/Csm16.bin -t $out/share/seabios/ + install -Dm644 out/${biosfile} -t $out/share/seabios/ runHook postInstall ''; From dd122c58b1e40900ee8bf87fcc2d290e930f8a39 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 30 Sep 2024 13:01:02 -0300 Subject: [PATCH 009/108] seabios: passthru attribute `firmware` So that the caller can pick the exact location of the resulting BIOS. --- pkgs/by-name/se/seabios/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/se/seabios/package.nix b/pkgs/by-name/se/seabios/package.nix index 0e0fc06aeb16..ac647e93b195 100644 --- a/pkgs/by-name/se/seabios/package.nix +++ b/pkgs/by-name/se/seabios/package.nix @@ -89,6 +89,11 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru = { + build-type = ___build-type; + firmware = "${finalAttrs.finalPackage}/share/seabios/${biosfile}"; + }; + meta = { homepage = "https://www.seabios.org"; description = "Open source implementation of a 16bit x86 BIOS"; From e032a06dc9cb5fd4cfa32e626adf13efee9a8d04 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 30 Sep 2024 13:01:21 -0300 Subject: [PATCH 010/108] {seabios-coreboot, seabios-csm, seabios-qemu}: "init" --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12aace53e661..87902dcf3b18 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5643,6 +5643,10 @@ with pkgs; nltk-data = callPackage ../tools/text/nltk-data { }; + seabios-coreboot = seabios.override { ___build-type = "coreboot"; }; + seabios-csm = seabios.override { ___build-type = "csm"; }; + seabios-qemu = seabios.override { ___build-type = "qemu"; }; + seaborn-data = callPackage ../tools/misc/seaborn-data { }; nodepy-runtime = with python3.pkgs; toPythonApplication nodepy-runtime; From f625fac9c160af9c182908cab6bd24d3f3cfe7da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Oct 2024 05:47:28 +0000 Subject: [PATCH 011/108] ord: 0.20.0 -> 0.20.1 --- pkgs/by-name/or/ord/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/or/ord/package.nix b/pkgs/by-name/or/ord/package.nix index cc5257d6189b..96e6dc775ae8 100644 --- a/pkgs/by-name/or/ord/package.nix +++ b/pkgs/by-name/or/ord/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "ord"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "ordinals"; repo = "ord"; rev = version; - hash = "sha256-qTTAViVZEw4XgYADoonsVZPulp43lFFkX2xE5OFbL3s="; + hash = "sha256-gnwlNDgYEcqbwflQAvPb92pJ8kOpiPHB1co7QyMJ/xA="; }; - cargoHash = "sha256-QSeAAaT1LbcWLmML8i2sgRtTnimZfKgLq6qhnpQr8cc="; + cargoHash = "sha256-6Phq3buWE+jHWrYsIhV9u5RTGtKqYkkyb/RjrdX1ETw="; nativeBuildInputs = [ pkg-config From c41d13bbc8caab00e9a748c5758340f531448861 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Oct 2024 09:28:47 +0000 Subject: [PATCH 012/108] zarf: 0.40.1 -> 0.41.0 --- pkgs/applications/networking/cluster/zarf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/zarf/default.nix b/pkgs/applications/networking/cluster/zarf/default.nix index ffc69b514713..c030a86e0a93 100644 --- a/pkgs/applications/networking/cluster/zarf/default.nix +++ b/pkgs/applications/networking/cluster/zarf/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "zarf"; - version = "0.40.1"; + version = "0.41.0"; src = fetchFromGitHub { owner = "defenseunicorns"; repo = "zarf"; rev = "v${version}"; - hash = "sha256-tSMaDb8lflkedDa5ICXthqMpWBkHg+UQ20aTrF4+hUQ="; + hash = "sha256-rY9xWqJ+2Yfs6VRHTF89LmuEruAavDI7MgBm4UFEuBs="; }; - vendorHash = "sha256-7G+gROPw8Ab6iGMr7vnmC7jAm7jLPd5pbLOkKqDKIDc="; + vendorHash = "sha256-Cz+w0tOEamCxf61hvQ03X/kXPY+qrmdBN8s26lr/wZ8="; proxyVendor = true; nativeBuildInputs = [ installShellFiles ]; From 28f520f07f1730faf8bd26410ee35bfc60a27d86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Oct 2024 10:00:16 +0000 Subject: [PATCH 013/108] termius: 9.6.1 -> 9.7.2 --- pkgs/applications/networking/termius/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index 487b13e55705..21234f5a34f4 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { pname = "termius"; - version = "9.6.1"; - revision = "204"; + version = "9.7.2"; + revision = "205"; src = fetchurl { # find the latest version with @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { # and the sha512 with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_${revision}.snap"; - hash = "sha512-ok3B/h+d0Q7k5i+IjgGB+4S5g2kzrQT/b4dYz4k07OnyfjJRgJ4X4f7BFFrwKLd+IbIC5OIibrvivWnkSWU3Ew=="; + hash = "sha512-LihbkFIFpulewNIHl1oiXJF1npuqNLvVjN8CAmDDf46PAXdpaiMMluHWIJ4NljAACh6d4Uw6m2pKgEDfFN1y6g=="; }; desktopItem = makeDesktopItem { From 8f7578348f63f581fadaf352459e68d14184acae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Oct 2024 10:28:45 +0000 Subject: [PATCH 014/108] cargo-binstall: 1.10.5 -> 1.10.7 --- pkgs/development/tools/rust/cargo-binstall/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/development/tools/rust/cargo-binstall/default.nix index f7b24266123f..eb6d5bff0026 100644 --- a/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.10.5"; + version = "1.10.7"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-VhmyfGVO1rDcorOznovkUu0GHgUSwKHhk/3jqg1pDZk="; + hash = "sha256-bQYKOo11zVIXNHdoD60oEdzSSYeLKppPJBen6wdrXq8="; }; - cargoHash = "sha256-rgr++LD6YsTlrxKmNRtn2gdT5a1ul6A5UrXgKmpWC7w="; + cargoHash = "sha256-Tr++ui715adP1taqj+Sms2yO3hF5SZl7zCrAkPYlSdY="; nativeBuildInputs = [ pkg-config From 9d5010cded6ec04c5d782c41b00fdb3e9ca2e0f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Oct 2024 14:51:55 +0000 Subject: [PATCH 015/108] sdrangel: 7.22.0 -> 7.22.1 --- pkgs/applications/radio/sdrangel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 36535678a8d6..e22bef1541b2 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -52,13 +52,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sdrangel"; - version = "7.22.0"; + version = "7.22.1"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${finalAttrs.version}"; - hash = "sha256-cF6vKwAWz32/XYUWvq/4Wu73TFQ2jaGIFxWmeXmlPCE="; + hash = "sha256-Vhxs1KVUDCbl/9abZByUuy230PV4RrYrRjEXgYc8oZU="; }; nativeBuildInputs = [ From 7779a7bdbee6202f22f13635ab2b6813230cb269 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 6 Oct 2024 23:16:53 +0100 Subject: [PATCH 016/108] mjmap: init at 0.1.0-unstable-2023-11-13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I needed to use `git send-email`, and I wanted an MTA that supported JMAP to use with it. We already package `mujmap`, but even after bumping it to the latest Git commit to deal with Fastmail authentication changes, it choked on the beautiful UTF‐8 email I created. Enter this random Go tool from a random SourceHut repository that did just the trick. --- pkgs/by-name/mj/mjmap/package.nix | 42 +++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 pkgs/by-name/mj/mjmap/package.nix diff --git a/pkgs/by-name/mj/mjmap/package.nix b/pkgs/by-name/mj/mjmap/package.nix new file mode 100644 index 000000000000..8751757fb568 --- /dev/null +++ b/pkgs/by-name/mj/mjmap/package.nix @@ -0,0 +1,42 @@ +{ + lib, + buildGoModule, + fetchFromSourcehut, + unstableGitUpdater, +}: + +buildGoModule { + pname = "mjmap"; + version = "0.1.0-unstable-2023-11-13"; + + src = fetchFromSourcehut { + owner = "~rockorager"; + repo = "mjmap"; + rev = "d54badae8152b4db6eec8b03a7bd7c5ff1724aa7"; + hash = "sha256-yFYYnklNNOHTfoT54kOIVoM4t282/0Ir4l72GmqlGSY="; + }; + + vendorHash = "sha256-fJuPrzjRH0FpYj2D9CsFdsdzYT0C3/D2PhmJIZTsgfQ="; + + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/mjmap --version >/dev/null + + runHook postInstallCheck + ''; + + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v."; + }; + + meta = { + description = "Sendmail‐compatible JMAP client"; + homepage = "https://git.sr.ht/~rockorager/mjmap"; + license = lib.licenses.mpl20; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + maintainers = [ lib.maintainers.emily ]; + mainProgram = "mjmap"; + platforms = lib.platforms.unix; + }; +} From 4f2e77a94e339ed119ef6d3022cad0d1496d0b18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Oct 2024 01:21:10 +0000 Subject: [PATCH 017/108] elektroid: 3.0.1 -> 3.1 --- pkgs/by-name/el/elektroid/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/el/elektroid/package.nix b/pkgs/by-name/el/elektroid/package.nix index 75b6c83295f5..467f7987d8ca 100644 --- a/pkgs/by-name/el/elektroid/package.nix +++ b/pkgs/by-name/el/elektroid/package.nix @@ -14,7 +14,7 @@ }: let - version = "3.0.1"; + version = "3.1"; in stdenv.mkDerivation { inherit version; @@ -25,7 +25,7 @@ stdenv.mkDerivation { owner = "dagargo"; repo = "elektroid"; rev = version; - hash = "sha256-Qv4jvk6N0IMgYGCPWNYGDZJKGA+UPzhHeYfSrkq5hy4="; + hash = "sha256-YJcvJlnRUhwjQ6P3jgjyDtoJhuije1uY77mGNGZure0="; }; nativeBuildInputs = [ From 08f99293ad068c013fc032459da77ea81fe30c02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Oct 2024 01:57:29 +0000 Subject: [PATCH 018/108] nng: 1.8.0 -> 1.9.0 --- pkgs/development/libraries/nng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nng/default.nix b/pkgs/development/libraries/nng/default.nix index 612f8e384570..9016424d4b30 100644 --- a/pkgs/development/libraries/nng/default.nix +++ b/pkgs/development/libraries/nng/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nng"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nng"; rev = "v${version}"; - hash = "sha256-E2uosZrmxO3fqwlLuu5e36P70iGj5xUlvhEb+1aSvOA="; + hash = "sha256-N1ZMILrFhdkwU4PK/zlSCgGjOm0748fgvZRrk7I9YVg="; }; nativeBuildInputs = [ cmake ninja ] From aae1becf166638dea5d090ec53a4b1989a1f2e9d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Oct 2024 02:42:34 +0000 Subject: [PATCH 019/108] sickgear: 3.32.7 -> 3.32.10 --- pkgs/servers/sickbeard/sickgear.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index 8210e252bdab..73b23ce6f940 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "3.32.7"; + version = "3.32.10"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - hash = "sha256-7kVT/aBL9EAx7oGeXEY9eL72dZGtuJUGlQ7bPyt/JZg="; + hash = "sha256-dgaSFTrBg3CM320M75AA2qQaKDkh3LycNqNgO8ewSrw="; }; patches = [ From 21a1cf96866c528fdcd712b4a6d3fc80290a2634 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Tue, 8 Oct 2024 00:21:42 +0800 Subject: [PATCH 020/108] mkPythonPackage, mkPythonApplication: handle passthru with mkDerivation --- .../python/mk-python-derivation.nix | 35 +++++++++---------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 086ebfb3ed04..073d9b816f08 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -215,23 +215,6 @@ let isSetuptoolsDependency = isSetuptoolsDependency' (attrs.pname or null); - passthru = - attrs.passthru or { } - // { - updateScript = let - filename = head (splitString ":" self.meta.position); - in attrs.passthru.updateScript or [ update-python-libraries filename ]; - } - // optionalAttrs (dependencies != []) { - inherit dependencies; - } - // optionalAttrs (optional-dependencies != {}) { - inherit optional-dependencies; - } - // optionalAttrs (build-system != []) { - inherit build-system; - }; - # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. self = toPythonModule (stdenv.mkDerivation ((cleanAttrs attrs) // { @@ -324,7 +307,21 @@ let outputs = outputs ++ optional withDistOutput "dist"; - inherit passthru; + passthru = attrs.passthru or { } + // { + updateScript = let + filename = head (splitString ":" self.meta.position); + in attrs.passthru.updateScript or [ update-python-libraries filename ]; + } + // optionalAttrs (dependencies != []) { + inherit dependencies; + } + // optionalAttrs (optional-dependencies != {}) { + inherit optional-dependencies; + } + // optionalAttrs (build-system != []) { + inherit build-system; + }; meta = { # default to python's platforms @@ -341,5 +338,5 @@ let in extendDerivation (disabled -> throw "${name} not supported for interpreter ${python.executable}") - passthru + { } self From 58bfe741230877e32be930a581bd2f89980b40d5 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sat, 10 Aug 2024 20:12:00 +0800 Subject: [PATCH 021/108] buildPython*: Deprecate and remove (buildPython* { ... }).override Deprecate (buildPythonPackage { ... }).override for Python packages in favour of overridePythonAttrs. This change does not affect the override interface of most Python packages, as the override interface is provided by callPackage and shadows the locally defined override attribute. --- nixos/doc/manual/release-notes/rl-2411.section.md | 3 +++ .../interpreters/python/python-packages-base.nix | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index f9a5846c1f38..88065629e629 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -161,6 +161,9 @@ - The nvidia driver no longer defaults to the proprietary driver starting with version 560. You will need to manually set `hardware.nvidia.open` to select the proprietary or open driver. +- The `(buildPythonPackage { ... }).override` attribute is now deprecated and removed in favour of `overridePythonAttrs`. + This change does not affect the override interface of most Python packages, as [`.override`](https://nixos.org/manual/nixpkgs/unstable/#sec-pkg-override) provided by `callPackage` shadows such a locally-defined `override` attribute. + - All Cinnamon and XApp packages have been moved to top-level (i.e., `cinnamon.nemo` is now `nemo`). - All GNOME packages have been moved to top-level (i.e., `gnome.nautilus` is now `nautilus`). diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index 9fad8e56d5d4..1b10b44fb243 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -37,15 +37,15 @@ let else ./python2/mk-python-derivation.nix; - buildPythonPackage = makeOverridablePythonPackage (lib.makeOverridable (callPackage mkPythonDerivation { + buildPythonPackage = makeOverridablePythonPackage (callPackage mkPythonDerivation { inherit namePrefix; # We want Python libraries to be named like e.g. "python3.6-${name}" inherit toPythonModule; # Libraries provide modules - })); + }); - buildPythonApplication = makeOverridablePythonPackage (lib.makeOverridable (callPackage mkPythonDerivation { + buildPythonApplication = makeOverridablePythonPackage (callPackage mkPythonDerivation { namePrefix = ""; # Python applications should not have any prefix toPythonModule = x: x; # Application does not provide modules. - })); + }); # Check whether a derivation provides a Python module. hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python; From d7a7ee168bcea9cb82856e6114ad26afc9378575 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Oct 2024 20:34:43 +0000 Subject: [PATCH 022/108] sway-assign-cgroups: 0.4.0 -> 0.4.1 --- pkgs/by-name/sw/sway-assign-cgroups/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sw/sway-assign-cgroups/package.nix b/pkgs/by-name/sw/sway-assign-cgroups/package.nix index e92dc058eaef..5b879c783c87 100644 --- a/pkgs/by-name/sw/sway-assign-cgroups/package.nix +++ b/pkgs/by-name/sw/sway-assign-cgroups/package.nix @@ -5,12 +5,12 @@ python3Packages.buildPythonApplication rec { pname = "sway-assign-cgroups"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "alebastr"; repo = "sway-systemd"; - rev = "v${version}"; - hash = "sha256-wznYE1/lVJtvf5Nq96gbPYisxc2gWLahVydwcH1vwoQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-AJ87/sPy8IVJgb5YehfUfNTOFEDithLfiTxgZfZf238="; }; format = "other"; From 68af0e8150bb22c785c316c8ce8a8d2b7dc12af4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Oct 2024 00:45:52 +0000 Subject: [PATCH 023/108] cubiomes-viewer: 4.0.1 -> 4.1.0 --- pkgs/applications/misc/cubiomes-viewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index f75ddf0c108d..7e96b34af40a 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "cubiomes-viewer"; - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; - hash = "sha256-UUvNSTM98r8D/Q+/pPTXwGzW4Sl1qhgem4WsFRfybuo="; + hash = "sha256-ORTFddzVGKXpy5V6zXJgCnwLwn/8cWKklpcoHkc6u34="; fetchSubmodules = true; }; From a05b328b2e15ba2805bbf34d9aefeeda61372e93 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 3 Oct 2024 22:58:58 +0900 Subject: [PATCH 024/108] python3.tests: remove unnecessary condition and disable failing tests on 3.13 --- .../development/interpreters/python/tests.nix | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index 6574b6295744..ba96f708257d 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -75,7 +75,7 @@ let is_virtualenv = "False"; }; - } // lib.optionalAttrs (python.pythonAtLeast "3.8") { + } // { # Venv built using Python Nix environment (python.buildEnv) # TODO: Cannot create venv from a nix env # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1. @@ -105,22 +105,24 @@ let # Integration tests involving the package set. # All PyPy package builds are broken at the moment - integrationTests = lib.optionalAttrs (!python.isPyPy) ( - lib.optionalAttrs (python.isPy3k && !stdenv.hostPlatform.isDarwin) { # darwin has no split-debug - cpython-gdb = callPackage ./tests/test_cpython_gdb { - interpreter = python; - }; - } // lib.optionalAttrs (python.pythonAtLeast "3.7") { - # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages - nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix { - interpreter = python; - }; - # Make sure tkinter is importable. See https://github.com/NixOS/nixpkgs/issues/238990 - tkinter = callPackage ./tests/test_tkinter { - interpreter = python; - }; - } - ); + integrationTests = lib.optionalAttrs (!python.isPyPy) ({ + # Make sure tkinter is importable. See https://github.com/NixOS/nixpkgs/issues/238990 + tkinter = callPackage ./tests/test_tkinter { + interpreter = python; + }; + } // lib.optionalAttrs (python.isPy3k && python.pythonOlder "3.13" && !stdenv.hostPlatform.isDarwin) { # darwin has no split-debug + # fails on python3.13 + cpython-gdb = callPackage ./tests/test_cpython_gdb { + interpreter = python; + }; + } // lib.optionalAttrs (python.isPy3k && python.pythonOlder "3.13") { + # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages + # mypy does not yet support python3.13 + # https://github.com/python/mypy/issues/17264 + nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix { + interpreter = python; + }; + }); # Test editable package support editableTests = let From 4681b2f987f8bdcdc7c06040184a506ab6e48bb8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Oct 2024 06:06:54 +0000 Subject: [PATCH 025/108] openapi-generator-cli: 7.8.0 -> 7.9.0 --- pkgs/tools/networking/openapi-generator-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index 995637e61d1d..648991ef73e0 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: let this = stdenv.mkDerivation (finalAttrs: { - version = "7.8.0"; + version = "7.9.0"; pname = "openapi-generator-cli"; jarfilename = "openapi-generator-cli-${finalAttrs.version}.jar"; @@ -12,7 +12,7 @@ let this = stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://maven/org/openapitools/openapi-generator-cli/${finalAttrs.version}/${finalAttrs.jarfilename}"; - sha256 = "sha256-0Yec9C2jH4z2HPaHmLjvJBivDGvZOlwYcOH/VD+7k2U="; + sha256 = "sha256-8Mt4OaLq2QQLIEUZsD8Uc7OcdyX9H0MTS7VQUVyz2+4="; }; dontUnpack = true; From b44c8b4c5f1cd7ac74bc90f2cf8ff2624513e9db Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 5 Oct 2024 00:40:12 +0200 Subject: [PATCH 026/108] saunafs: create link for mount.saunafs Required for mount -t saunafs to work --- pkgs/by-name/sa/saunafs/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/sa/saunafs/package.nix b/pkgs/by-name/sa/saunafs/package.nix index 587df043f050..f92db67558f4 100644 --- a/pkgs/by-name/sa/saunafs/package.nix +++ b/pkgs/by-name/sa/saunafs/package.nix @@ -60,6 +60,8 @@ stdenv.mkDerivation (finalAttrs: { postInstall = lib.optionalString (!stdenv.hostPlatform.isStatic) '' rm $out/lib/*.a + + ln -s $out/bin/sfsmount $out/bin/mount.saunafs ''; meta = with lib; { From 3b8166bb64f140ddfbfe8c6f90a01bc6cf7c29dc Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 9 Oct 2024 00:31:00 +0300 Subject: [PATCH 027/108] python312Packages.xarray: don't use with lib; in meta --- pkgs/development/python-modules/xarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index a0abc6074a35..a9e29d4a8388 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -42,10 +42,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "xarray" ]; - meta = with lib; { + meta = { changelog = "https://github.com/pydata/xarray/blob/${src.rev}/doc/whats-new.rst"; description = "N-D labeled arrays and datasets in Python"; homepage = "https://github.com/pydata/xarray"; - license = licenses.asl20; + license = lib.licenses.asl20; }; } From 36d1e27eee5a0d81e0368ee76764c83339df6db6 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 9 Oct 2024 00:31:36 +0300 Subject: [PATCH 028/108] python312Packages.xarray: adopt by doronbehar --- pkgs/development/python-modules/xarray/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index a9e29d4a8388..b8184eb6dcb4 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -47,5 +47,8 @@ buildPythonPackage rec { description = "N-D labeled arrays and datasets in Python"; homepage = "https://github.com/pydata/xarray"; license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + doronbehar + ]; }; } From 7e90c20b0af611f320b345e363f77162d8260134 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 9 Oct 2024 00:31:50 +0300 Subject: [PATCH 029/108] python312Packages.xarray: 2024.07.0 -> 2024.09.0 Diff: https://github.com/pydata/xarray/compare/refs/tags/v2024.07.0...v2024.09.0 Changelog: https://github.com/pydata/xarray/blob/refs/tags/v2024.09.0/doc/whats-new.rst --- pkgs/development/python-modules/xarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index b8184eb6dcb4..2696b2574326 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "xarray"; - version = "2024.07.0"; + version = "2024.09.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pydata"; repo = "xarray"; rev = "refs/tags/v${version}"; - hash = "sha256-pt0qnkgf3E/QQHQAaZLommakhqEJ4NuTyjx5tdk2N1U="; + hash = "sha256-ZrqdpzcNjZMxET355PRWQaUPjvFm+m2y71F7qt8DCjg="; }; build-system = [ From d0d676f2fa7baa83c9c037d0312d23f49a070ce6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Oct 2024 03:14:17 +0000 Subject: [PATCH 030/108] python312Packages.gotenberg-client: 0.6.0 -> 0.7.0 --- pkgs/development/python-modules/gotenberg-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gotenberg-client/default.nix b/pkgs/development/python-modules/gotenberg-client/default.nix index e86eb4e6e0e4..bb18da52f951 100644 --- a/pkgs/development/python-modules/gotenberg-client/default.nix +++ b/pkgs/development/python-modules/gotenberg-client/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { pname = "gotenberg-client"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "stumpylog"; repo = "gotenberg-client"; rev = "refs/tags/${version}"; - hash = "sha256-rF4msWYWgNUtOnMAB11vdAPNWZeAoeglnzMPWEM503I="; + hash = "sha256-pkxu9WIsyHW2iTepv5B2naKkK+yw8lT+i3EwobE+u1M="; }; nativeBuildInputs = [ hatchling ]; From 73e6e022749f8c354177513e07cf6e3ce76e999d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Oct 2024 04:28:22 +0000 Subject: [PATCH 031/108] python312Packages.accelerate: 0.34.2 -> 1.0.0 --- pkgs/development/python-modules/accelerate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index a809c48b7313..bcbd29bcc963 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "accelerate"; - version = "0.34.2"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "accelerate"; rev = "refs/tags/v${version}"; - hash = "sha256-4kDNLta6gGev16A4hNOArTpoD8p6LMRwqwHS/DZjtz0="; + hash = "sha256-XVJqyhDSUPQDHdaB6GDxHhuC6EWCSZNArjzyLpvhQHI="; }; buildInputs = [ llvmPackages.openmp ]; From f4534b691ad464c06ac31893c51a51338b9bef64 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sat, 5 Oct 2024 20:03:58 +0200 Subject: [PATCH 032/108] python312Packages.pynitrokey: 0.4.50 -> 0.6.0 https://github.com/Nitrokey/pynitrokey/releases/tag/v0.5.0 https://github.com/Nitrokey/pynitrokey/releases/tag/v0.6.0 --- .../python-modules/pynitrokey/default.nix | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/pynitrokey/default.nix b/pkgs/development/python-modules/pynitrokey/default.nix index a144da100369..5334ff2bbfdc 100644 --- a/pkgs/development/python-modules/pynitrokey/default.nix +++ b/pkgs/development/python-modules/pynitrokey/default.nix @@ -16,21 +16,21 @@ python-dateutil, pyusb, requests, - spsdk, tqdm, tlv8, typing-extensions, - pyserial, - protobuf, click-aliases, semver, nethsm, importlib-metadata, + nitrokey, + pyscard, + asn1crypto, }: let pname = "pynitrokey"; - version = "0.4.50"; + version = "0.6.0"; mainProgram = "nitropy"; in @@ -40,10 +40,14 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-BIBwIYxoUcK7E69REcu/qmrpNlyYwnA7Im3iRSsWlnA="; + hash = "sha256-pY6ATORZDPGRnkN6dse1s/DzQRpplDbPAGUHU4E7U9M="; }; - propagatedBuildInputs = [ + nativeBuildInputs = [ installShellFiles ]; + + build-system = [ flit-core ]; + + dependencies = [ certifi cffi click @@ -55,21 +59,16 @@ buildPythonPackage { python-dateutil pyusb requests - spsdk tqdm tlv8 typing-extensions - pyserial - protobuf click-aliases semver nethsm importlib-metadata - ]; - - nativeBuildInputs = [ - flit-core - installShellFiles + nitrokey + pyscard + asn1crypto ]; pythonRelaxDeps = true; From 05819f55dad295eaa0ebc6efb3c95a8c48ef3c51 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Thu, 10 Oct 2024 08:31:29 +0200 Subject: [PATCH 033/108] gitlab: 17.2.8 -> 17.2.9 Fixes CVE-2024-9164 Fixes CVE-2024-8970 Fixes CVE-2024-8977 Fixes CVE-2024-9631 Fixes CVE-2024-6530 Fixes CVE-2024-9623 Fixes CVE-2024-5005 Fixes CVE-2024-9596 --- .../applications/version-management/gitlab/data.json | 12 ++++++------ .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-pages/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 9b4b7f2ae019..033870a4e421 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "17.2.8", - "repo_hash": "172ba8vlaqphyhi6d5r9j3km7krxcis81dzlr5xch4i0apd0yyag", + "version": "17.2.9", + "repo_hash": "060d5rzbcnhr1fsvbaiirgjm5rjr5c5r6yi601lxvksffyn5hmxw", "yarn_hash": "10y540bxwaz355p9r4q34199aibadrd5p4d9ck2y3n6735k0hm74", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v17.2.8-ee", + "rev": "v17.2.9-ee", "passthru": { - "GITALY_SERVER_VERSION": "17.2.8", - "GITLAB_PAGES_VERSION": "17.2.8", + "GITALY_SERVER_VERSION": "17.2.9", + "GITLAB_PAGES_VERSION": "17.2.9", "GITLAB_SHELL_VERSION": "14.37.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.2.0", - "GITLAB_WORKHORSE_VERSION": "17.2.8" + "GITLAB_WORKHORSE_VERSION": "17.2.9" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 3fe22d7050f0..45f5914852db 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -6,7 +6,7 @@ }: let - version = "17.2.8"; + version = "17.2.9"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -20,7 +20,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-3LaBETnwWmiIi7r68NB8LeJ7fo6oP28fS3TbU5JanOE="; + hash = "sha256-UgNQtM3NdAUJVP+vvTHtZWSjCmVzsHlEtXQroxKorIY="; }; vendorHash = "sha256-FqnGVRldhevJgBBvJcvGXzRaYWqSHzZiXIQmCNzJv+4="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index e30dcebfd697..7fb674689237 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "17.2.8"; + version = "17.2.9"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-NaLRCLmgDI4ArJyntkmYICVEpwZtAU6XVTmXAh4kOSc="; + hash = "sha256-ggfPZ/PMjgfRzzPZdVCVydd/4mdCfh2xh7QWGjp5U/0="; }; vendorHash = "sha256-yNHeM8MExcLwv2Ga4vtBmPFBt/Rj7Gd4QQYDlnAIo+c="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index ef6709b94540..235ddbf54aed 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "17.2.8"; + version = "17.2.9"; # nixpkgs-update: no auto update src = fetchFromGitLab { From 1697c659b7e5f508b9074d265795db05bbc44259 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Thu, 10 Oct 2024 21:26:42 +0200 Subject: [PATCH 034/108] netdata: 1.47.3 -> 1.47.4 --- pkgs/tools/system/netdata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 7c55378664a8..a951dfc77126 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -53,7 +53,7 @@ let stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; in stdenv'.mkDerivation (finalAttrs: { - version = "1.47.3"; + version = "1.47.4"; pname = "netdata"; src = fetchFromGitHub { @@ -62,10 +62,10 @@ stdenv'.mkDerivation (finalAttrs: { rev = "v${finalAttrs.version}"; hash = if withCloudUi then - "sha256-rua4wDkTEQbH5fS6gVDF0y3QsQ+eG8Eki4JFxmiRN5k=" + "sha256-PCaY6J3X4zUUJ8kRCGmLLbk2Pkp5CnH3rxOaoAdsKG4=" # we delete the v2 GUI after fetching else - "sha256-IR54OgYiOAmDgysm+3MLeMkxyNWkJe3BLKL9gaFHdvo="; + "sha256-W4g/ns+XfBSf6iACIW+6lfzZJLMktTfe5/n3egL27XE="; fetchSubmodules = true; # Remove v2 dashboard distributed under NCUL1. Make sure an empty From c9a175a7411469d938d418494aa491145a35385e Mon Sep 17 00:00:00 2001 From: jfvillablanca <31008330+jfvillablanca@users.noreply.github.com> Date: Fri, 11 Oct 2024 15:24:29 +0800 Subject: [PATCH 035/108] pdm: 2.19.1 -> 2.19.2 https://github.com/pdm-project/pdm/releases/tag/2.19.2 --- pkgs/tools/package-management/pdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index fe2cf57d19cf..f1af411fa5a0 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "pdm"; - version = "2.19.1"; + version = "2.19.2"; pyproject = true; disabled = python3.pkgs.pythonOlder "3.8"; @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { owner = "pdm-project"; repo = "pdm"; rev = "refs/tags/${version}"; - hash = "sha256-V2ZcXgRtL8zkCx5/d+L+3o0QQHVrPpFyjvjsc2auWDI="; + hash = "sha256-m+ZVaAZZ4+/qqJs3B8/CEj+in/mrBKgfrx1OD3GpXLU="; }; nativeBuildInputs = [ installShellFiles ]; From e243629e1a7dc9533d573c5b6dd1d217dff953b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Oct 2024 08:54:16 +0000 Subject: [PATCH 036/108] netscanner: 0.5.3 -> 0.6.0 --- pkgs/by-name/ne/netscanner/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/netscanner/package.nix b/pkgs/by-name/ne/netscanner/package.nix index 8bca17373560..77b242ec9058 100644 --- a/pkgs/by-name/ne/netscanner/package.nix +++ b/pkgs/by-name/ne/netscanner/package.nix @@ -6,7 +6,7 @@ }: let pname = "netscanner"; - version = "0.5.3"; + version = "0.6.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage { owner = "Chleba"; repo = "netscanner"; rev = "refs/tags/v${version}"; - hash = "sha256-rqUGi7UF9y3VZ0KoctCesQVgJbR1WfqhFA6aYFFimNk="; + hash = "sha256-p7ajWY/eGWHPosxFXOKs2YeMAny+/PJ68IAU2NNgm0w="; }; - cargoHash = "sha256-VP6L3lXDXadimSWC2L4yfzTRfTcUilJtZ7TeHARAKAY="; + cargoHash = "sha256-F6titbFM0zsbbwZKcSx3U4cknea83TCITiGm7rPXmFE="; postFixup = '' wrapProgram $out/bin/netscanner \ From 8facc9dcb6c4794ae9171aaa176fb7d6f2065091 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Oct 2024 10:11:27 +0000 Subject: [PATCH 037/108] python312Packages.optimum: 1.22.0 -> 1.23.0 --- pkgs/development/python-modules/optimum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix index d23fe4ab529b..02485462a8b1 100644 --- a/pkgs/development/python-modules/optimum/default.nix +++ b/pkgs/development/python-modules/optimum/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.22.0"; + version = "1.23.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-fVpSoa6s7puYO8BiA6aSAhSOTfiZJgaX5iwYkd9VdVo="; + hash = "sha256-1A430tvuUsMiVmDbISdj2g5l05D6FswGKsjdUBpZrP0="; }; build-system = [ setuptools ]; From 63070c9ae98b11ed13c2841e79f9360b24c9aafc Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Wed, 9 Oct 2024 09:35:45 -0400 Subject: [PATCH 038/108] texlab: 5.19.0 -> 5.20.0 --- pkgs/development/tools/misc/texlab/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 68e29724eb00..301abb6df1af 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -15,16 +15,16 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.19.0"; + version = "5.20.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - hash = "sha256-iH7KqZddP4uKwTBxLLMURUtWBsuEtLHGQppVgGFaWZQ="; + hash = "sha256-hKQdc9p69L0t2MwCR4Fy20Nl+2qQk5JJoCaB4O43DNY="; }; - cargoHash = "sha256-QW+q869bVAMYv4SCj/2eKrADoDonrvQuaHuanZHIjMo="; + cargoHash = "sha256-A/stdJ1baV0hdDXTdLd9gi8+JO7qPgQbNiYjHkp1GPQ="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { # generate the man page postInstall = lib.optionalString (!isCross) '' # TexLab builds man page separately in CI: - # https://github.com/latex-lsp/texlab/blob/v5.16.1/.github/workflows/publish.yml#L117-L121 + # https://github.com/latex-lsp/texlab/blob/v5.20.0/.github/workflows/publish.yml#L110-L114 help2man --no-info "$out/bin/texlab" > texlab.1 installManPage texlab.1 ''; From ced695af7883191ea40a96b5304e5794d3ce8110 Mon Sep 17 00:00:00 2001 From: Tomo Date: Wed, 9 Oct 2024 18:30:49 +0000 Subject: [PATCH 039/108] python3Packages.django-mdeditor: patch out polyfill.io usage, bump KaTeX Part of #323379 --- ...eX-and-replace-bootcdn-with-jsdelivr.patch | 63 +++++++++++++++++++ .../django-mdeditor/default.nix | 4 ++ 2 files changed, 67 insertions(+) create mode 100644 pkgs/development/python-modules/django-mdeditor/Bump-KaTeX-and-replace-bootcdn-with-jsdelivr.patch diff --git a/pkgs/development/python-modules/django-mdeditor/Bump-KaTeX-and-replace-bootcdn-with-jsdelivr.patch b/pkgs/development/python-modules/django-mdeditor/Bump-KaTeX-and-replace-bootcdn-with-jsdelivr.patch new file mode 100644 index 000000000000..28f7b182809f --- /dev/null +++ b/pkgs/development/python-modules/django-mdeditor/Bump-KaTeX-and-replace-bootcdn-with-jsdelivr.patch @@ -0,0 +1,63 @@ +From c5af641cccf663dffb4a47d32e28404f609badce Mon Sep 17 00:00:00 2001 +From: Tomo +Date: Sat, 12 Oct 2024 03:39:12 +0000 +Subject: [PATCH 1/2] chore(KaTeX): bump to 0.7.1 + +Many bugfixes. This KaTeX is still quite old, +but versions beyond this have backwards-incompatibilities +(starting in 0.8). +--- + mdeditor/static/mdeditor/js/editormd.js | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mdeditor/static/mdeditor/js/editormd.js b/mdeditor/static/mdeditor/js/editormd.js +index be0005d..8aacb56 100644 +--- a/mdeditor/static/mdeditor/js/editormd.js ++++ b/mdeditor/static/mdeditor/js/editormd.js +@@ -4179,8 +4179,8 @@ + // 使用国外的CDN，加载速度有时会很慢，或者自定义URL + // You can custom KaTeX load url. + editormd.katexURL = { +- css : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.3.0/katex.min", +- js : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.3.0/katex.min" ++ css : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.7.1/katex.min", ++ js : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.7.1/katex.min" + }; + + editormd.kaTeXLoaded = false; +-- +2.46.2 + + +From 3d082a738262b057d33b9aa8c777d50113143952 Mon Sep 17 00:00:00 2001 +From: Tomo +Date: Mon, 7 Oct 2024 17:44:39 -0700 +Subject: [PATCH 2/2] fix(KaTeX): Use jsdelivr instead of bootcdn + +Bootcdn was compromised by a malicious actor: +https://sansec.io/research/polyfill-supply-chain-attack + +KaTeX recommends using jsdelivr, so I used that: +https://katex.org/docs/browser +--- + mdeditor/static/mdeditor/js/editormd.js | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mdeditor/static/mdeditor/js/editormd.js b/mdeditor/static/mdeditor/js/editormd.js +index 8aacb56..a31e817 100644 +--- a/mdeditor/static/mdeditor/js/editormd.js ++++ b/mdeditor/static/mdeditor/js/editormd.js +@@ -4179,8 +4179,8 @@ + // 使用国外的CDN，加载速度有时会很慢，或者自定义URL + // You can custom KaTeX load url. + editormd.katexURL = { +- css : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.7.1/katex.min", +- js : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.7.1/katex.min" ++ css : "//cdn.jsdelivr.net/npm/katex@0.7.1/dist/katex.min.css", ++ js : "//cdn.jsdelivr.net/npm/katex@0.7.1/dist/katex.min.js" + }; + + editormd.kaTeXLoaded = false; +-- +2.46.2 + diff --git a/pkgs/development/python-modules/django-mdeditor/default.nix b/pkgs/development/python-modules/django-mdeditor/default.nix index 96b5c93bae2d..a495b41c892d 100644 --- a/pkgs/development/python-modules/django-mdeditor/default.nix +++ b/pkgs/development/python-modules/django-mdeditor/default.nix @@ -18,6 +18,10 @@ buildPythonPackage { hash = "sha256-t57j1HhjNQtBwlbqe4mAHQ9WiNcIhMKYmrZkiqh+k5k="; }; + patches = [ + ./Bump-KaTeX-and-replace-bootcdn-with-jsdelivr.patch + ]; + propagatedBuildInputs = [ django ]; # no tests From 7c010c25e52098d9252445eaf9b313f327115384 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 10 Oct 2024 16:45:44 +0200 Subject: [PATCH 040/108] minetest: add mainProgram and conditional test builds --- pkgs/games/minetest/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index f4ccf5ac71e9..de566217b1ba 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BUILD_CLIENT" buildClient) (lib.cmakeBool "BUILD_SERVER" buildServer) + (lib.cmakeBool "BUILD_UNITTESTS" (finalAttrs.doCheck or false)) (lib.cmakeBool "ENABLE_PROMETHEUS" buildServer) (lib.cmakeBool "USE_SDL2" useSDL2) # Ensure we use system libraries @@ -91,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: { gmp libspatialindex ] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform luajit) luajit - ++ lib.optionals stdenv.hostPlatform.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv OpenGL OpenAL @@ -118,7 +119,8 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' - substituteInPlace src/filesys.cpp --replace "/bin/rm" "${coreutils}/bin/rm" + substituteInPlace src/filesys.cpp \ + --replace-fail "/bin/rm" "${coreutils}/bin/rm" '' + lib.optionalString stdenv.hostPlatform.isDarwin '' sed -i '/pagezero_size/d;/fixup_bundle/d' src/CMakeLists.txt ''; @@ -130,6 +132,8 @@ stdenv.mkDerivation (finalAttrs: { mv $out/minetest.app $out/Applications ''; + doCheck = true; + passthru.updateScript = gitUpdater { allowedVersions = "\\."; ignoredVersions = "-android$"; @@ -141,5 +145,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.lgpl21Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pyrolagus fpletz fgaz ]; + mainProgram = if buildClient then "minetest" else "minetestserver"; }; }) From 933a976af1a3ed381bd814072d06c33b2a3610b7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 15:28:39 +0200 Subject: [PATCH 041/108] python312Packages.mypy-boto3-acm-pca: 1.35.0 -> 1.35.38 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 73652ca4c532..ed87136a4f43 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -58,8 +58,8 @@ rec { "sha256-kdakfB1uRg5K+FZyeNSQxvBYj0+ztJrDTq4Dkh6dqAA="; mypy-boto3-acm-pca = - buildMypyBoto3Package "acm-pca" "1.35.0" - "sha256-YU4Djb4Z9//5WYvkSgv9vlv4oG8Da6dP/Oktpuff4q0="; + buildMypyBoto3Package "acm-pca" "1.35.38" + "sha256-9hJo5ZV8ckN5+V/L6MOowyWr2eZoroVRmzooMDDA6WE="; mypy-boto3-amp = buildMypyBoto3Package "amp" "1.35.0" From 7721bb73d1d16e4a6eeeaf1cdcee675b28a72cc8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 15:28:43 +0200 Subject: [PATCH 042/108] python312Packages.mypy-boto3-appflow: 1.35.0 -> 1.35.39 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index ed87136a4f43..171f71916aff 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -102,8 +102,8 @@ rec { "sha256-jwjD2mkz6YpUEOwEHMNiIzBNoVwYUUONQjKZemGFEl8="; mypy-boto3-appflow = - buildMypyBoto3Package "appflow" "1.35.0" - "sha256-tNCfrUzsRHhpfIY+D2Y+OscMnYw7lGeYhFvs+wHq9zk="; + buildMypyBoto3Package "appflow" "1.35.39" + "sha256-W5GJoGRQUcjTBUYAWJjBgMKcAKRdn63deVsyU6ezRIU="; mypy-boto3-appintegrations = buildMypyBoto3Package "appintegrations" "1.35.0" From cd7fa235d5d1adb9ce6442435f2e478c312ad4f4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 15:28:58 +0200 Subject: [PATCH 043/108] python312Packages.mypy-boto3-codepipeline: 1.35.33 -> 1.35.37 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 171f71916aff..5ad4f91397f8 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -294,8 +294,8 @@ rec { "sha256-UJmPVW20ofQmmer9/IYwaFIU2+xhXcT+0s2aUxFDGZY="; mypy-boto3-codepipeline = - buildMypyBoto3Package "codepipeline" "1.35.33" - "sha256-hnmb6+m1iiVfzNjm1AxGlAkEjSbAslPe4st7i52Kj3w="; + buildMypyBoto3Package "codepipeline" "1.35.37" + "sha256-DHNj6IzWxg5qHpT0QaHQHNPkYk344fo/2/vUGLl8Kfg="; mypy-boto3-codestar = buildMypyBoto3Package "codestar" "1.35.0" From 66320c08ea3db0712a02b8848b5a67e7d8f7e9a5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 15:29:09 +0200 Subject: [PATCH 044/108] python312Packages.mypy-boto3-dms: 1.35.0 -> 1.35.38 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 5ad4f91397f8..3c0969ad408d 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -414,8 +414,8 @@ rec { "sha256-yJ3ApQy6xeEdxNcRQG5mekfK1aP7FPdR79TfbRZkESo="; mypy-boto3-dms = - buildMypyBoto3Package "dms" "1.35.0" - "sha256-mTwE5mn8GTCMuidyk8cYnZEk3PkrnP2ykVZgn2geMTo="; + buildMypyBoto3Package "dms" "1.35.38" + "sha256-b9AA9n1WWgk4HV1U/3L/eVl4eualNyhYCjbFw+QvHV4="; mypy-boto3-docdb = buildMypyBoto3Package "docdb" "1.35.0" From f756416dd38bf5a0e9811ba0582521a06082eae5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 15:29:12 +0200 Subject: [PATCH 045/108] python312Packages.mypy-boto3-ec2: 1.35.34 -> 1.35.38 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 3c0969ad408d..a42723540252 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -446,8 +446,8 @@ rec { "sha256-wBJ7PnAlsi88AZIRPoNgbzOhPwUAJBegtwk+tw1lOwU="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.35.34" - "sha256-gi80wl0sVQmaeYdAiPIeeL2Uc8dwQuGDTFKRvbGh6Co="; + buildMypyBoto3Package "ec2" "1.35.38" + "sha256-AwY1//39/3P8l+zEsunb7Mun//B1wiR8ae+ZxGulzRo="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.35.0" From 04fd0af9b16b727e0bae8fedd73ff2dea4a1b88a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 15:29:15 +0200 Subject: [PATCH 046/108] python312Packages.mypy-boto3-ecs: 1.35.21 -> 1.35.38 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index a42723540252..31a4c3152764 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -462,8 +462,8 @@ rec { "sha256-KXtN44KAIDXjMgv3ICG8rXYfEjcZ85pQ+qdvN2Yiq3g="; mypy-boto3-ecs = - buildMypyBoto3Package "ecs" "1.35.21" - "sha256-DSmCf9/TXUfoEYppEZOxAJOxuOCZK5p6GRIKWIa3aPQ="; + buildMypyBoto3Package "ecs" "1.35.38" + "sha256-udIe50T9ae7esIkpVqmMvRtTwv4xDJTiwkR94cX+2M4="; mypy-boto3-efs = buildMypyBoto3Package "efs" "1.35.0" From 56f3452796d110e06f480284955d58612aae6521 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 15:29:17 +0200 Subject: [PATCH 047/108] python312Packages.mypy-boto3-elastic-inference: 1.35.0 -> 1.35.38 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 31a4c3152764..7cc209c58fb6 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -474,8 +474,8 @@ rec { "sha256-w+uJ5Jqfbnj3ykj59C8sbhitp5MyTIE+PnZXrlIkOag="; mypy-boto3-elastic-inference = - buildMypyBoto3Package "elastic-inference" "1.35.0" - "sha256-GpOOU/ritDu+hDZL8adN5fLYhYt0bgBTqCv2mDjt1T0="; + buildMypyBoto3Package "elastic-inference" "1.35.38" + "sha256-D+Ecu2+03ua8vs8C2NdGtDVSUpyM0SozHIb2PbRO2+g="; mypy-boto3-elasticache = buildMypyBoto3Package "elasticache" "1.35.36" From 5e3640c9b2c1652165df20d915e51e0d7988b804 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 15:29:19 +0200 Subject: [PATCH 048/108] python312Packages.mypy-boto3-elbv2: 1.35.18 -> 1.35.39 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 7cc209c58fb6..f83d189ff88c 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -494,8 +494,8 @@ rec { "sha256-fw/vfzKXXQSG7xj9FolkJgzciHBz4ELlFh2MlEJ6wQI="; mypy-boto3-elbv2 = - buildMypyBoto3Package "elbv2" "1.35.18" - "sha256-BlHZi/WM1rKK0QWbAYfHmdpZmgm8ZpWZPZQ4gz0k4oY="; + buildMypyBoto3Package "elbv2" "1.35.39" + "sha256-k7IgKkdS2h5p+Xl+UhiQRtk9fjCZQMzc2FXRRTjscTc="; mypy-boto3-emr = buildMypyBoto3Package "emr" "1.35.18" From 941844b11fcc0c7d93b7cf4643d796c354c49bdb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 15:29:20 +0200 Subject: [PATCH 049/108] python312Packages.mypy-boto3-emr: 1.35.18 -> 1.35.39 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index f83d189ff88c..feb3e78eccae 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -498,8 +498,8 @@ rec { "sha256-k7IgKkdS2h5p+Xl+UhiQRtk9fjCZQMzc2FXRRTjscTc="; mypy-boto3-emr = - buildMypyBoto3Package "emr" "1.35.18" - "sha256-yXm2k6pDyJ1N93q6ltz6jvQy17AKpKsKhVFMpS1oGaI="; + buildMypyBoto3Package "emr" "1.35.39" + "sha256-PAVHgUn9cbnu7EPOO2+SNbT+WrayTP/mmIoqt3Kw29E="; mypy-boto3-emr-containers = buildMypyBoto3Package "emr-containers" "1.35.4" From 7fc568cd2fdf3cbfba0b7ff549dae5bf93a767e2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 15:29:28 +0200 Subject: [PATCH 050/108] python312Packages.mypy-boto3-guardduty: 1.35.22 -> 1.35.39 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index feb3e78eccae..323a354e96f8 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -594,8 +594,8 @@ rec { "sha256-U0sYInE/1XsjwQCxmcYLVvmEQf4R6drtdSqTr0b+3OM="; mypy-boto3-guardduty = - buildMypyBoto3Package "guardduty" "1.35.22" - "sha256-+Ro4QM8DwrDlbroFb6YV6fZGYPieHB0B5+EgdNrnIzQ="; + buildMypyBoto3Package "guardduty" "1.35.39" + "sha256-6+k3i6IdCsHW8xTy/AG2JcfDqpGGj67JSihC6OPjXYE="; mypy-boto3-health = buildMypyBoto3Package "health" "1.35.0" From e9cea4262d656576db5d81a6078a76d558d9a09c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 15:29:35 +0200 Subject: [PATCH 051/108] python312Packages.mypy-boto3-iotfleetwise: 1.35.0 -> 1.35.38 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 323a354e96f8..8cacfeefbd99 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -674,8 +674,8 @@ rec { "sha256-Hse02blZttIxqJovJ3h6yCEi+jN3e+pfznIXjBAid1k="; mypy-boto3-iotfleetwise = - buildMypyBoto3Package "iotfleetwise" "1.35.0" - "sha256-VQCFJX2wZYKWey8yxEBoAK29uDxb/xn5+EuZH739DV8="; + buildMypyBoto3Package "iotfleetwise" "1.35.38" + "sha256-vkQmyoPMcf2ZBnJ1TJba2uNJL3GaVVZI9h3R75C3uR8="; mypy-boto3-iotsecuretunneling = buildMypyBoto3Package "iotsecuretunneling" "1.35.0" From ac7194ea01c7ce718c1676471736cf1bd126ea48 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 15:29:59 +0200 Subject: [PATCH 052/108] python312Packages.mypy-boto3-outposts: 1.35.0 -> 1.35.38 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 8cacfeefbd99..c99f9d161e95 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -994,8 +994,8 @@ rec { "sha256-PdOH3KaQn9d455qCR565qFlyCb8t7R8x8wXBebHgtt8="; mypy-boto3-outposts = - buildMypyBoto3Package "outposts" "1.35.0" - "sha256-CFULIBMCKb4mUQ7ogh5hvfewDMpsP1jnQEJmtuArCck="; + buildMypyBoto3Package "outposts" "1.35.38" + "sha256-Adb8A8DVn3T00xuEtXXT+LHxwM4jh0IG3JLUiAi02ds="; mypy-boto3-panorama = buildMypyBoto3Package "panorama" "1.35.0" From 54dae1f888efa89fcf6daf546d88dd1637073549 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 15:30:09 +0200 Subject: [PATCH 053/108] python312Packages.mypy-boto3-robomaker: 1.35.0 -> 1.35.39 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index c99f9d161e95..19b4fc41b5a5 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1126,8 +1126,8 @@ rec { "sha256-3DVLn61w42L8qwyQB1WbOPjOZXqXalLZ9rITcmcDkQI="; mypy-boto3-robomaker = - buildMypyBoto3Package "robomaker" "1.35.0" - "sha256-Yl7v7zQHeixpG244Qld1vceR8ZazGjcUc26LUuane3I="; + buildMypyBoto3Package "robomaker" "1.35.39" + "sha256-kh/KojcYdBfGA7BRorshz34R/Lx8e/WTa0kWpW78PcY="; mypy-boto3-rolesanywhere = buildMypyBoto3Package "rolesanywhere" "1.35.0" From b7a6cb641cdb0e227b3c37659bf3d602e3569774 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 15:30:12 +0200 Subject: [PATCH 054/108] python312Packages.mypy-boto3-route53resolver: 1.35.0 -> 1.35.38 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 19b4fc41b5a5..e7f9d93942a9 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1154,8 +1154,8 @@ rec { "sha256-pM5+b6he5Gp9DuD2Uz/x+SYmVzxhZIh/gJ626S9I19g="; mypy-boto3-route53resolver = - buildMypyBoto3Package "route53resolver" "1.35.0" - "sha256-F0ixOVQ8zmCrspV3+a5QmuJdvc5NOV8WiWdepiIeW9E="; + buildMypyBoto3Package "route53resolver" "1.35.38" + "sha256-MVADJUXYj6HvnJIZZJVfi/rMRCJFE1BZfcoQKvlg69Y="; mypy-boto3-rum = buildMypyBoto3Package "rum" "1.35.0" From d22d60f3acbba13db9242e40606b6c15b7ed65fb Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 3 Oct 2024 11:39:24 +0200 Subject: [PATCH 055/108] nixos/saunafs: add module + test --- nixos/modules/module-list.nix | 1 + .../services/network-filesystems/saunafs.nix | 287 ++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/saunafs.nix | 122 ++++++++ 4 files changed, 411 insertions(+) create mode 100644 nixos/modules/services/network-filesystems/saunafs.nix create mode 100644 nixos/tests/saunafs.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 193cb43118f4..345adaa3c26b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -966,6 +966,7 @@ ./services/network-filesystems/rsyncd.nix ./services/network-filesystems/samba-wsdd.nix ./services/network-filesystems/samba.nix + ./services/network-filesystems/saunafs.nix ./services/network-filesystems/tahoe.nix ./services/network-filesystems/u9fs.nix ./services/network-filesystems/webdav-server-rs.nix diff --git a/nixos/modules/services/network-filesystems/saunafs.nix b/nixos/modules/services/network-filesystems/saunafs.nix new file mode 100644 index 000000000000..5c3c513c06f7 --- /dev/null +++ b/nixos/modules/services/network-filesystems/saunafs.nix @@ -0,0 +1,287 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.saunafs; + + settingsFormat = + let + listSep = " "; + allowedTypes = with lib.types; [ + bool + int + float + str + ]; + valueToString = + val: + if lib.isList val then + lib.concatStringsSep listSep (map (x: valueToString x) val) + else if lib.isBool val then + (if val then "1" else "0") + else + toString val; + + in + { + type = + let + valueType = + lib.types.oneOf ( + [ + (lib.types.listOf valueType) + ] + ++ allowedTypes + ) + // { + description = "Flat key-value file"; + }; + in + lib.types.attrsOf valueType; + + generate = + name: value: + pkgs.writeText name ( + lib.concatStringsSep "\n" (lib.mapAttrsToList (key: val: "${key} = ${valueToString val}") value) + ); + }; + + initTool = pkgs.writeShellScriptBin "sfsmaster-init" '' + if [ ! -e ${cfg.master.settings.DATA_PATH}/metadata.sfs ]; then + cp --update=none ${pkgs.saunafs}/var/lib/saunafs/metadata.sfs.empty ${cfg.master.settings.DATA_PATH}/metadata.sfs + chmod +w ${cfg.master.settings.DATA_PATH}/metadata.sfs + fi + ''; + + # master config file + masterCfg = settingsFormat.generate "sfsmaster.cfg" cfg.master.settings; + + # metalogger config file + metaloggerCfg = settingsFormat.generate "sfsmetalogger.cfg" cfg.metalogger.settings; + + # chunkserver config file + chunkserverCfg = settingsFormat.generate "sfschunkserver.cfg" cfg.chunkserver.settings; + + # generic template for all daemons + systemdService = name: extraConfig: configFile: { + wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; + after = [ + "network.target" + "network-online.target" + ]; + + serviceConfig = { + Type = "forking"; + ExecStart = "${pkgs.saunafs}/bin/sfs${name} -c ${configFile} start"; + ExecStop = "${pkgs.saunafs}/bin/sfs${name} -c ${configFile} stop"; + ExecReload = "${pkgs.saunafs}/bin/sfs${name} -c ${configFile} reload"; + } // extraConfig; + }; + +in +{ + ###### interface + + options = { + services.saunafs = { + masterHost = lib.mkOption { + type = lib.types.str; + default = null; + description = "IP or hostname name of master host."; + }; + + sfsUser = lib.mkOption { + type = lib.types.str; + default = "saunafs"; + description = "Run daemons as user."; + }; + + client.enable = lib.mkEnableOption "Saunafs client"; + + master = { + enable = lib.mkOption { + type = lib.types.bool; + description = '' + Enable Saunafs master daemon. + + You need to run `sfsmaster-init` on a freshly installed master server to + initialize the `DATA_PATH` directory. + ''; + default = false; + }; + + exports = lib.mkOption { + type = with lib.types; listOf str; + default = null; + description = "Paths to exports file (see {manpage}`sfsexports.cfg(5)`)."; + example = lib.literalExpression '' + [ "* / rw,alldirs,admin,maproot=0:0" ]; + ''; + }; + + openFirewall = lib.mkOption { + type = lib.types.bool; + description = "Whether to automatically open the necessary ports in the firewall."; + default = false; + }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options.DATA_PATH = lib.mkOption { + type = lib.types.str; + default = "/var/lib/saunafs/master"; + description = "Data storage directory."; + }; + }; + + description = "Contents of config file ({manpage}`sfsmaster.cfg(5)`)."; + }; + }; + + metalogger = { + enable = lib.mkEnableOption "Saunafs metalogger daemon"; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options.DATA_PATH = lib.mkOption { + type = lib.types.str; + default = "/var/lib/saunafs/metalogger"; + description = "Data storage directory"; + }; + }; + + description = "Contents of metalogger config file (see {manpage}`sfsmetalogger.cfg(5)`)."; + }; + }; + + chunkserver = { + enable = lib.mkEnableOption "Saunafs chunkserver daemon"; + + openFirewall = lib.mkOption { + type = lib.types.bool; + description = "Whether to automatically open the necessary ports in the firewall."; + default = false; + }; + + hdds = lib.mkOption { + type = with lib.types; listOf str; + default = null; + + example = lib.literalExpression '' + [ "/mnt/hdd1" ]; + ''; + + description = '' + Mount points to be used by chunkserver for storage (see {manpage}`sfshdd.cfg(5)`). + + Note, that these mount points must writeable by the user defined by the saunafs user. + ''; + }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options.DATA_PATH = lib.mkOption { + type = lib.types.str; + default = "/var/lib/saunafs/chunkserver"; + description = "Directory for chunck meta data"; + }; + }; + + description = "Contents of chunkserver config file (see {manpage}`sfschunkserver.cfg(5)`)."; + }; + }; + }; + }; + + ###### implementation + + config = + lib.mkIf (cfg.client.enable || cfg.master.enable || cfg.metalogger.enable || cfg.chunkserver.enable) + { + + warnings = [ + (lib.mkIf (cfg.sfsUser == "root") "Running saunafs services as root is not recommended.") + ]; + + # Service settings + services.saunafs = { + master.settings = lib.mkIf cfg.master.enable { + WORKING_USER = cfg.sfsUser; + EXPORTS_FILENAME = toString ( + pkgs.writeText "sfsexports.cfg" (lib.concatStringsSep "\n" cfg.master.exports) + ); + }; + + metalogger.settings = lib.mkIf cfg.metalogger.enable { + WORKING_USER = cfg.sfsUser; + MASTER_HOST = cfg.masterHost; + }; + + chunkserver.settings = lib.mkIf cfg.chunkserver.enable { + WORKING_USER = cfg.sfsUser; + MASTER_HOST = cfg.masterHost; + HDD_CONF_FILENAME = toString ( + pkgs.writeText "sfshdd.cfg" (lib.concatStringsSep "\n" cfg.chunkserver.hdds) + ); + }; + }; + + # Create system user account for daemons + users = + lib.mkIf + (cfg.sfsUser != "root" && (cfg.master.enable || cfg.metalogger.enable || cfg.chunkserver.enable)) + { + users."${cfg.sfsUser}" = { + isSystemUser = true; + description = "saunafs daemon user"; + group = "saunafs"; + }; + groups."${cfg.sfsUser}" = { }; + }; + + environment.systemPackages = + (lib.optional cfg.client.enable pkgs.saunafs) ++ (lib.optional cfg.master.enable initTool); + + networking.firewall.allowedTCPPorts = + (lib.optionals cfg.master.openFirewall [ + 9419 + 9420 + 9421 + ]) + ++ (lib.optional cfg.chunkserver.openFirewall 9422); + + # Ensure storage directories exist + systemd.tmpfiles.rules = + lib.optional cfg.master.enable "d ${cfg.master.settings.DATA_PATH} 0700 ${cfg.sfsUser} ${cfg.sfsUser} -" + ++ lib.optional cfg.metalogger.enable "d ${cfg.metalogger.settings.DATA_PATH} 0700 ${cfg.sfsUser} ${cfg.sfsUser} -" + ++ lib.optional cfg.chunkserver.enable "d ${cfg.chunkserver.settings.DATA_PATH} 0700 ${cfg.sfsUser} ${cfg.sfsUser} -"; + + # Service definitions + systemd.services.sfs-master = lib.mkIf cfg.master.enable ( + systemdService "master" { + TimeoutStartSec = 1800; + TimeoutStopSec = 1800; + Restart = "no"; + } masterCfg + ); + + systemd.services.sfs-metalogger = lib.mkIf cfg.metalogger.enable ( + systemdService "metalogger" { Restart = "on-abort"; } metaloggerCfg + ); + + systemd.services.sfs-chunkserver = lib.mkIf cfg.chunkserver.enable ( + systemdService "chunkserver" { Restart = "on-abort"; } chunkserverCfg + ); + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 0e2a21803c2e..26ae8388f825 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -889,6 +889,7 @@ in { samba-wsdd = handleTest ./samba-wsdd.nix {}; sane = handleTest ./sane.nix {}; sanoid = handleTest ./sanoid.nix {}; + saunafs = handleTest ./saunafs.nix {}; scaphandre = handleTest ./scaphandre.nix {}; schleuder = handleTest ./schleuder.nix {}; scion-freestanding-deployment = handleTest ./scion/freestanding-deployment {}; diff --git a/nixos/tests/saunafs.nix b/nixos/tests/saunafs.nix new file mode 100644 index 000000000000..49d986175716 --- /dev/null +++ b/nixos/tests/saunafs.nix @@ -0,0 +1,122 @@ +import ./make-test-python.nix ( + { pkgs, lib, ... }: + + let + master = + { pkgs, ... }: + { + # data base is stored in memory + # server may crash with default memory size + virtualisation.memorySize = 1024; + + services.saunafs.master = { + enable = true; + openFirewall = true; + exports = [ + "* / rw,alldirs,maproot=0:0" + ]; + }; + }; + + chunkserver = + { pkgs, ... }: + { + virtualisation.emptyDiskImages = [ 4096 ]; + boot.initrd.postDeviceCommands = '' + ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb + ''; + + fileSystems = pkgs.lib.mkVMOverride { + "/data" = { + device = "/dev/disk/by-label/data"; + fsType = "ext4"; + }; + }; + + services.saunafs = { + masterHost = "master"; + chunkserver = { + openFirewall = true; + enable = true; + hdds = [ "/data" ]; + + # The test image is too small and gets set to "full" + settings.HDD_LEAVE_SPACE_DEFAULT = "100M"; + }; + }; + }; + + metalogger = + { pkgs, ... }: + { + services.saunafs = { + masterHost = "master"; + metalogger.enable = true; + }; + }; + + client = + { pkgs, lib, ... }: + { + services.saunafs.client.enable = true; + # systemd.tmpfiles.rules = [ "d /sfs 755 root root -" ]; + systemd.network.enable = true; + + # Use networkd to have properly functioning + # network-online.target + networking = { + useDHCP = false; + useNetworkd = true; + }; + + systemd.mounts = [ + { + requires = [ "network-online.target" ]; + after = [ "network-online.target" ]; + wantedBy = [ "remote-fs.target" ]; + type = "saunafs"; + what = "master:/"; + where = "/sfs"; + } + ]; + }; + + in + { + name = "saunafs"; + + meta.maintainers = [ lib.maintainers.markuskowa ]; + + nodes = { + inherit master metalogger; + chunkserver1 = chunkserver; + chunkserver2 = chunkserver; + client1 = client; + client2 = client; + }; + + testScript = '' + # prepare master server + master.start() + master.wait_for_unit("multi-user.target") + master.succeed("sfsmaster-init") + master.succeed("systemctl restart sfs-master") + master.wait_for_unit("sfs-master.service") + + metalogger.wait_for_unit("sfs-metalogger.service") + + # Setup chunkservers + for chunkserver in [chunkserver1, chunkserver2]: + chunkserver.wait_for_unit("multi-user.target") + chunkserver.succeed("chown saunafs:saunafs /data") + chunkserver.succeed("systemctl restart sfs-chunkserver") + chunkserver.wait_for_unit("sfs-chunkserver.service") + + for client in [client1, client2]: + client.wait_for_unit("multi-user.target") + + client1.succeed("echo test > /sfs/file") + client2.succeed("grep test /sfs/file") + ''; + } +) From 1fea71d3f44fd79ef331ec1c6646988df6794afb Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 8 Oct 2024 22:13:29 +0200 Subject: [PATCH 056/108] saunafs: add VM test to passthru.test --- pkgs/by-name/sa/saunafs/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/sa/saunafs/package.nix b/pkgs/by-name/sa/saunafs/package.nix index f92db67558f4..054a26f9e394 100644 --- a/pkgs/by-name/sa/saunafs/package.nix +++ b/pkgs/by-name/sa/saunafs/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + nixosTests, fetchFromGitHub, cmake, asciidoc, @@ -64,6 +65,8 @@ stdenv.mkDerivation (finalAttrs: { ln -s $out/bin/sfsmount $out/bin/mount.saunafs ''; + passthru.tests = nixosTests.saunafs; + meta = with lib; { description = "Distributed POSIX file system"; homepage = "https://saunafs.com"; From 2d5bae69322e74f1195bb05881a50990f9225fa4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 8 Oct 2024 22:18:19 +0200 Subject: [PATCH 057/108] nixos/release-notes: add saunafs under "New modules" sections --- nixos/doc/manual/release-notes/rl-2411.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index f1f0695dcdcf..ebfb9aee3e79 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -175,6 +175,8 @@ - [Immich](https://github.com/immich-app/immich), a self-hosted photo and video backup solution. Available as [services.immich](#opt-services.immich.enable). +- [saunafs](https://saunafs.com) Distributed POSIX file system. Available as [services.saunafs](options.html#opt-services.saunafs). + - [obs-studio](https://obsproject.com/), Free and open source software for video recording and live streaming. Available as [programs.obs-studio.enable](#opt-programs.obs-studio.enable). - [Veilid](https://veilid.com), a headless server that enables privacy-focused data sharing and messaging on a peer-to-peer network. Available as [services.veilid](#opt-services.veilid.enable). From 7b203d49d361e531162dc7835692ac7b2cc46b4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?= Date: Sat, 12 Oct 2024 21:42:57 +0300 Subject: [PATCH 058/108] proton-pass: 1.23.0 -> 1.23.1 Update to the latest version. --- pkgs/by-name/pr/proton-pass/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix index be85c54ffc17..5545ab8a94f2 100644 --- a/pkgs/by-name/pr/proton-pass/package.nix +++ b/pkgs/by-name/pr/proton-pass/package.nix @@ -8,11 +8,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-pass"; - version = "1.23.0"; + version = "1.23.1"; src = fetchurl { url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb"; - hash = "sha256-ewrPk3v1jgF87uY+7P8oQdWARcuFKdfiM1BzulMPBpg="; + hash = "sha256-D4OFHL9AS8oAwMZHoXaDpHKfMBQEaOd18eWAwVW4EJA="; }; dontConfigure = true; From c972191db2832403cb00fa79829a19806663f81f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 12 Oct 2024 23:52:59 +0200 Subject: [PATCH 059/108] python312Packages.gios: 4.0.0 -> 5.0.0 Diff: https://github.com/bieniu/gios/compare/refs/tags/4.0.0...5.0.0 Changelog: https://github.com/bieniu/gios/releases/tag/5.0.0 --- pkgs/development/python-modules/gios/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gios/default.nix b/pkgs/development/python-modules/gios/default.nix index 0a5632ad31de..952056492c70 100644 --- a/pkgs/development/python-modules/gios/default.nix +++ b/pkgs/development/python-modules/gios/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "gios"; - version = "4.0.0"; + version = "5.0.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = "gios"; rev = "refs/tags/${version}"; - hash = "sha256-rjC4zWWtaPxuBcjiO9dVsXD4dTa47iwkKuSFx+QXeXw="; + hash = "sha256-J+LCu7wMuc3dYghvkKq58GcBAa76X5IPUWe7qCQwjjI="; }; build-system = [ setuptools ]; From 4f6cd4f94a5b152cd5c4df2445e589823a9fe902 Mon Sep 17 00:00:00 2001 From: Robin Mattheussen Date: Sun, 13 Oct 2024 03:34:46 +0200 Subject: [PATCH 060/108] exult: 1.8 -> 1.10.1 --- pkgs/games/exult/default.nix | 24 +++++++++++++++++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index ab09e4efed40..cc32d13617dc 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , SDL2 , autoconf +, autoconf-archive +, autoreconfHook , automake , libogg , libtool @@ -10,21 +12,31 @@ , pkg-config , zlib , enableTools ? false +# Darwin-specific +, AudioUnit }: stdenv.mkDerivation rec { pname = "exult"; - version = "1.8"; + version = "1.10.1"; src = fetchFromGitHub { owner = "exult"; repo = "exult"; rev = "v${version}"; - hash = "sha256-Y7FpgiGuqR4ZG/PNSfLcNcRWeeC7GebUTighXsCfy+E="; + hash = "sha256-NlvtYtmJNYhOC1BtIxIij3NEQHWAGOeD4XgRq7evjzE="; }; + # We can't use just DESTDIR because with it we'll have /nix/store/...-exult-1.10.1/nix/store/...-exult-1.10.1/bin + postPatch = '' + substituteInPlace macosx/macosx.am \ + --replace-fail DESTDIR NIX_DESTDIR + ''; + nativeBuildInputs = [ autoconf + autoconf-archive + autoreconfHook automake libtool pkg-config @@ -35,12 +47,13 @@ stdenv.mkDerivation rec { libogg libvorbis zlib + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + AudioUnit ]; - preConfigure = '' - ./autogen.sh - ''; + enableParallelBuilding = true; + makeFlags = [ "NIX_DESTDIR=$(out)" ]; # see postPatch configureFlags = lib.optional (!enableTools) "--disable-tools"; meta = with lib; { @@ -58,5 +71,6 @@ stdenv.mkDerivation rec { homepage = "http://exult.info"; license = licenses.gpl2Plus; maintainers = with maintainers; [ azahi ]; + mainProgram = "exult"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac40c890cd23..0b7e9ba4810e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34694,7 +34694,9 @@ with pkgs; extremetuxracer = callPackage ../games/extremetuxracer { }; - exult = callPackage ../games/exult { }; + exult = callPackage ../games/exult { + inherit (darwin.apple_sdk.frameworks) AudioUnit; + }; fallout-ce = callPackage ../games/fallout-ce/fallout-ce.nix { }; fallout2-ce = callPackage ../games/fallout-ce/fallout2-ce.nix { }; From a2a5d5392bccc278c35125d104241479553f15c2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Oct 2024 09:48:41 +0200 Subject: [PATCH 061/108] python312Packages.lxmf: 0.5.5 -> 0.5.6 Diff: https://github.com/markqvist/lxmf/compare/refs/tags/0.5.5...0.5.6 Changelog: https://github.com/markqvist/LXMF/releases/tag/0.5.6 --- pkgs/development/python-modules/lxmf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index 4c8f04cbd511..e4ddf9735fec 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.5.5"; + version = "0.5.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-1zZRONzKafXfnmszRl7oCRTFBsy9U1bUaOzWwt7jLzY="; + hash = "sha256-nhi15afsvzM0LCvtI5/dq5zOHmhM4Wk53lj6fKgx9NA="; }; build-system = [ setuptools ]; From 95873cc318e8ace6ea512300fca0d047a7d5c8d2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Oct 2024 09:50:38 +0200 Subject: [PATCH 062/108] python312Packages.rns: 0.8.3 -> 0.8.4 Diff: https://github.com/markqvist/Reticulum/compare/refs/tags/0.8.3...0.8.4 Changelog: https://github.com/markqvist/Reticulum/releases/tag/0.8.4 --- pkgs/development/python-modules/rns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 64d63ce24f97..684c06255dfc 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.8.3"; + version = "0.8.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-A1ZDyYHjbC2jz+m4EHRPlOMzkpwCCxo902bMK4I/+I4="; + hash = "sha256-uonOifCGvSKJhxTAqD49BOHDdN69pRexcb2ny1GwqjA="; }; patches = [ From 062246918721586a5de2433cb0fc0e8c5b874e07 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Oct 2024 09:53:31 +0200 Subject: [PATCH 063/108] python312Packages.types-pytz: 2024.2.0.20240913 -> 2024.2.0.20241003 --- pkgs/development/python-modules/types-pytz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index 7e6986f2a95a..44e9fcaabd3c 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2024.2.0.20240913"; + version = "2024.2.0.20241003"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-RDO130pvxYe77UFxbYalul2DK0N45Qb0DTS8nIHfLCQ="; + hash = "sha256-V13DjzhakiohK6wAp9bS4W4UETKjyVUHj0pP0T7Wy0Q="; }; build-system = [ setuptools ]; From 6e3df11a8a9e820fc44c6ca5f7fa4286ff2206cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Oct 2024 08:38:32 +0000 Subject: [PATCH 064/108] debian-goodies: 0.88.1 -> 0.88.2 --- pkgs/applications/misc/debian-goodies/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/debian-goodies/default.nix b/pkgs/applications/misc/debian-goodies/default.nix index 897881dec46c..6e0fc3a0fb4a 100644 --- a/pkgs/applications/misc/debian-goodies/default.nix +++ b/pkgs/applications/misc/debian-goodies/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "debian-goodies"; - version = "0.88.1"; + version = "0.88.2"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "debian-goodies"; rev = "debian/${version}"; - sha256 = "sha256-g1xeWhCkC7HEHHOJpcZ6JFA9jmavJE0lUX1Cmp5A0QQ="; + sha256 = "sha256-KPPRxYmCEYwlUAR29tc8w4rerXpswO/rbpEjXPoDV4Q="; }; postPatch = '' From 32309e44684573695f70b7e3845925be05f8db9f Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 13 Oct 2024 16:28:39 +0300 Subject: [PATCH 065/108] wire-desktop: add CVE-2024-6775 to knownVulnerabilities wire-desktop on Linux uses electron 29.4.5, which is known to be vulnerable to CVE-2024-6775: https://github.com/wireapp/wire-desktop/blob/cf65edb5981be370f3284555512696175099e234/package.json#L85 The MacOS version is even older, and affected by this too. --- .../networking/instant-messengers/wire-desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 2030a3f467b4..1b4ae2a4e74a 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -57,6 +57,7 @@ let homepage = "https://wire.com/"; downloadPage = "https://wire.com/download/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + knownVulnerabilities = [ "CVE-2024-6775" ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ arianvp From 188b5df7cd035edc1e77f5d9c108ce61d679f213 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Wed, 2 Oct 2024 18:13:17 +0200 Subject: [PATCH 066/108] percona-server, percona-xtrabackup: rework naming When reworking the percona package naming towards the two release streams "innovation" and "lts", I did not anticipate the case that two releases are long-term supported in parallel, and that the latest Innovation release is end-of-life and replaced by a more recent lts. Hence, the first-level attribute names now reflect the package major-minor versions again, augmented by attribute names pointing to respective lts and innovation releases. --- pkgs/servers/sql/percona-server/{lts.nix => 8_0.nix} | 0 .../sql/percona-server/{innovation.nix => 8_3.nix} | 0 pkgs/servers/sql/percona-server/default.nix | 6 ++++-- pkgs/tools/backup/percona-xtrabackup/{lts.nix => 8_0.nix} | 0 .../backup/percona-xtrabackup/{innovation.nix => 8_3.nix} | 0 pkgs/tools/backup/percona-xtrabackup/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 2 -- pkgs/top-level/all-packages.nix | 8 ++++++-- 8 files changed, 12 insertions(+), 8 deletions(-) rename pkgs/servers/sql/percona-server/{lts.nix => 8_0.nix} (100%) rename pkgs/servers/sql/percona-server/{innovation.nix => 8_3.nix} (100%) rename pkgs/tools/backup/percona-xtrabackup/{lts.nix => 8_0.nix} (100%) rename pkgs/tools/backup/percona-xtrabackup/{innovation.nix => 8_3.nix} (100%) diff --git a/pkgs/servers/sql/percona-server/lts.nix b/pkgs/servers/sql/percona-server/8_0.nix similarity index 100% rename from pkgs/servers/sql/percona-server/lts.nix rename to pkgs/servers/sql/percona-server/8_0.nix diff --git a/pkgs/servers/sql/percona-server/innovation.nix b/pkgs/servers/sql/percona-server/8_3.nix similarity index 100% rename from pkgs/servers/sql/percona-server/innovation.nix rename to pkgs/servers/sql/percona-server/8_3.nix diff --git a/pkgs/servers/sql/percona-server/default.nix b/pkgs/servers/sql/percona-server/default.nix index 002765a04cd9..e7d55c4af962 100644 --- a/pkgs/servers/sql/percona-server/default.nix +++ b/pkgs/servers/sql/percona-server/default.nix @@ -1,12 +1,14 @@ pkgs: { - percona-server_lts = pkgs.callPackage ./lts.nix { + # old lts + percona-server_8_0 = pkgs.callPackage ./8_0.nix { inherit (pkgs.darwin) developer_cmds DarwinTools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; boost = pkgs.boost177; # Configure checks for specific version. icu = pkgs.icu69; + # newer versions cause linking failures against `libabsl_spinlock_wait` protobuf = pkgs.protobuf_21; }; - percona-server_innovation = pkgs.callPackage ./innovation.nix { + percona-server_8_3 = pkgs.callPackage ./8_3.nix { inherit (pkgs.darwin) developer_cmds DarwinTools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; # newer versions cause linking failures against `libabsl_spinlock_wait` diff --git a/pkgs/tools/backup/percona-xtrabackup/lts.nix b/pkgs/tools/backup/percona-xtrabackup/8_0.nix similarity index 100% rename from pkgs/tools/backup/percona-xtrabackup/lts.nix rename to pkgs/tools/backup/percona-xtrabackup/8_0.nix diff --git a/pkgs/tools/backup/percona-xtrabackup/innovation.nix b/pkgs/tools/backup/percona-xtrabackup/8_3.nix similarity index 100% rename from pkgs/tools/backup/percona-xtrabackup/innovation.nix rename to pkgs/tools/backup/percona-xtrabackup/8_3.nix diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/pkgs/tools/backup/percona-xtrabackup/default.nix index f3466dc9f165..0cf044ff51c7 100644 --- a/pkgs/tools/backup/percona-xtrabackup/default.nix +++ b/pkgs/tools/backup/percona-xtrabackup/default.nix @@ -1,6 +1,6 @@ pkgs: { - percona-xtrabackup_lts = pkgs.callPackage ./lts.nix { + percona-xtrabackup_8_0 = pkgs.callPackage ./8_0.nix { boost = pkgs.boost177; }; - percona-xtrabackup_innovation = pkgs.callPackage ./innovation.nix { }; + percona-xtrabackup_8_3 = pkgs.callPackage ./8_3.nix { }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e5d2e936717d..313b9fd7b687 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1213,8 +1213,6 @@ mapAliases { pdf2xml = throw "'pdf2xml' was removed: abandoned for years."; # Added 2023-10-22 peach = asouldocs; # Added 2022-08-28 pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23 - percona-server_8_0 = percona-server_lts; # Added 2024-05-07 - percona-xtrabackup_8_0 = percona-xtrabackup_lts; # Added 2024-05-07 perldevel = throw "'perldevel' has been dropped due to lack of updates in nixpkgs and lack of consistent support for devel versions by 'perl-cross' releases, use 'perl' instead"; perldevelPackages = perldevel; petrinizer = throw "'petrinizer' has been removed, as it was broken and unmaintained"; # added 2024-05-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3cba16c1aa9f..0b6c41d1a382 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11089,9 +11089,13 @@ with pkgs; perceptualdiff = callPackage ../tools/graphics/perceptualdiff { }; - inherit (import ../servers/sql/percona-server pkgs) percona-server_lts percona-server_innovation; + inherit (import ../servers/sql/percona-server pkgs) percona-server_8_0 percona-server_8_3; + percona-server_lts = percona-server_8_0; + percona-server_innovation = percona-server_8_3; percona-server = percona-server_lts; - inherit (import ../tools/backup/percona-xtrabackup pkgs) percona-xtrabackup_lts percona-xtrabackup_innovation; + inherit (import ../tools/backup/percona-xtrabackup pkgs) percona-xtrabackup_8_0 percona-xtrabackup_8_3; + percona-xtrabackup_lts = percona-xtrabackup_8_0; + percona-xtrabackup_innovation = percona-xtrabackup_8_3; percona-xtrabackup = percona-xtrabackup_lts; pick = callPackage ../tools/misc/pick { }; From 712028ec9ae4d54b689f6df2ae43e8fdfd3b216b Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Wed, 2 Oct 2024 17:27:52 +0200 Subject: [PATCH 067/108] percona-server_8_4: init at 8.4.0-1 This is a new LTS release as well. --- pkgs/servers/sql/percona-server/8_3.nix | 123 ----------- pkgs/servers/sql/percona-server/8_4.nix | 221 ++++++++++++++++++++ pkgs/servers/sql/percona-server/default.nix | 2 +- pkgs/top-level/all-packages.nix | 7 +- 4 files changed, 226 insertions(+), 127 deletions(-) delete mode 100644 pkgs/servers/sql/percona-server/8_3.nix create mode 100644 pkgs/servers/sql/percona-server/8_4.nix diff --git a/pkgs/servers/sql/percona-server/8_3.nix b/pkgs/servers/sql/percona-server/8_3.nix deleted file mode 100644 index 61b2ff7bb4a1..000000000000 --- a/pkgs/servers/sql/percona-server/8_3.nix +++ /dev/null @@ -1,123 +0,0 @@ -{ lib, stdenv, fetchurl, bison, cmake, pkg-config -, boost, icu, libedit, libevent, lz4, ncurses, openssl, perl, protobuf, re2, readline, zlib, zstd, libfido2 -, numactl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests -, coreutils, procps, gnused, gnugrep, hostname, makeWrapper -, systemd -# Percona-specific deps -, cyrus_sasl, gnumake, openldap -# optional: different malloc implementations -, withJemalloc ? false, withTcmalloc ? false, jemalloc, gperftools -}: - -assert !(withJemalloc && withTcmalloc); - - -stdenv.mkDerivation (finalAttrs: { - pname = "percona-server_innovation"; - version = "8.3.0-1"; - - src = fetchurl { - url = "https://downloads.percona.com/downloads/percona-distribution-mysql-ps/percona-distribution-mysql-ps-${builtins.head (lib.strings.split "-" finalAttrs.version)}/source/tarball/percona-server-${finalAttrs.version}.tar.gz"; - hash = "sha256-GeuifzqCkStmb4qYa8147XBHvMogYwfsn0FyHdO4WEg"; - }; - - nativeBuildInputs = [ - bison cmake pkg-config makeWrapper - # required for scripts/CMakeLists.txt - coreutils gnugrep procps - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]; - - patches = [ - ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch - ]; - - ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references. - postPatch = '' - substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool - substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool - # The rocksdb setup script is called with `env -i` and cannot find anything in PATH. - patchShebangs storage/rocksdb/get_rocksdb_files.sh - substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace mktemp ${coreutils}/bin/mktemp - substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "rm $MKFILE" "${coreutils}/bin/rm $MKFILE" - substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "make --" "${gnumake}/bin/make --" - ''; - - buildInputs = [ - boost (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib - zstd libfido2 openldap perl cyrus_sasl - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - numactl libtirpc systemd - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - cctools CoreServices developer_cmds DarwinTools - ] - ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) jemalloc - ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) gperftools; - - outputs = [ "out" "static" ]; - - cmakeFlags = [ - # Percona-specific flags. - "-DPORTABLE=1" - "-DWITH_LDAP=system" - "-DROCKSDB_DISABLE_AVX2=1" - "-DROCKSDB_DISABLE_MARCH_NATIVE=1" - - # Flags taken from mysql package. - "-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin. - "-DWITH_ROUTER=OFF" # It may be packaged separately. - "-DWITH_SYSTEM_LIBS=ON" - "-DWITH_UNIT_TESTS=OFF" - "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" - "-DMYSQL_DATADIR=/var/lib/mysql" - "-DINSTALL_INFODIR=share/mysql/docs" - "-DINSTALL_MANDIR=share/man" - "-DINSTALL_PLUGINDIR=lib/mysql/plugin" - "-DINSTALL_INCLUDEDIR=include/mysql" - "-DINSTALL_DOCREADMEDIR=share/mysql" - "-DINSTALL_SUPPORTFILESDIR=share/mysql" - "-DINSTALL_MYSQLSHAREDIR=share/mysql" - "-DINSTALL_MYSQLTESTDIR=" - "-DINSTALL_DOCDIR=share/mysql/docs" - "-DINSTALL_SHAREDIR=share/mysql" - - - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - "-DWITH_SYSTEMD=1" - "-DWITH_SYSTEMD_DEBUG=1" - ] - ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) "-DWITH_JEMALLOC=1" - ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) "-DWITH_TCMALLOC=1"; - - postInstall = '' - moveToOutput "lib/*.a" $static - so=${stdenv.hostPlatform.extensions.sharedLibrary} - ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so - - wrapProgram $out/bin/mysqld_safe --prefix PATH : ${lib.makeBinPath [ coreutils procps gnugrep gnused hostname ]} - wrapProgram $out/bin/mysql_config --prefix PATH : ${lib.makeBinPath [ coreutils gnused ]} - wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]} - wrapProgram $out/bin/ps-admin --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]} - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - wrapProgram $out/bin/mysqld_multi --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]} - ''; - - passthru = { - client = finalAttrs.finalPackage; - connector-c = finalAttrs.finalPackage; - server = finalAttrs.finalPackage; - mysqlVersion = lib.versions.majorMinor finalAttrs.version; - tests = nixosTests.mysql.percona-server_innovation; - }; - - - meta = with lib; { - homepage = "https://www.percona.com/software/mysql-database/percona-server"; - description = '' - A free, fully compatible, enhanced, open source drop-in replacement for - MySQL® that provides superior performance, scalability and instrumentation. - ''; - license = licenses.gpl2; - maintainers = teams.flyingcircus.members; - platforms = platforms.unix; - }; -}) diff --git a/pkgs/servers/sql/percona-server/8_4.nix b/pkgs/servers/sql/percona-server/8_4.nix new file mode 100644 index 000000000000..6ed5e077b40a --- /dev/null +++ b/pkgs/servers/sql/percona-server/8_4.nix @@ -0,0 +1,221 @@ +{ + lib, + stdenv, + fetchurl, + bison, + cmake, + pkg-config, + boost, + icu, + libedit, + libevent, + lz4, + ncurses, + openssl, + perl, + protobuf, + re2, + readline, + zlib, + zstd, + libfido2, + numactl, + cctools, + CoreServices, + developer_cmds, + libtirpc, + rpcsvc-proto, + curl, + DarwinTools, + nixosTests, + coreutils, + procps, + gnused, + gnugrep, + hostname, + makeWrapper, + systemd, + # Percona-specific deps + cyrus_sasl, + gnumake, + openldap, + # optional: different malloc implementations + withJemalloc ? false, + withTcmalloc ? false, + jemalloc, + gperftools, +}: + +assert !(withJemalloc && withTcmalloc); + +stdenv.mkDerivation (finalAttrs: { + pname = "percona-server"; + version = "8.4.0-1"; + + src = fetchurl { + url = "https://downloads.percona.com/downloads/Percona-Server-${lib.versions.majorMinor finalAttrs.version}/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz"; + hash = "sha256-76PXXqTNBVsD7RX2vhp7RyESiFpJL0h0zG9ucNfy3uQ="; + }; + + nativeBuildInputs = [ + bison + cmake + pkg-config + makeWrapper + # required for scripts/CMakeLists.txt + coreutils + gnugrep + procps + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]; + + patches = [ + ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch + ]; + + ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references. + postPatch = '' + substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool + substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool + # The rocksdb setup script is called with `env -i` and cannot find anything in PATH. + patchShebangs storage/rocksdb/get_rocksdb_files.sh + substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace mktemp ${coreutils}/bin/mktemp + substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "rm $MKFILE" "${coreutils}/bin/rm $MKFILE" + substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "make --" "${gnumake}/bin/make --" + ''; + + buildInputs = + [ + boost + (curl.override { inherit openssl; }) + icu + libedit + libevent + lz4 + ncurses + openssl + protobuf + re2 + readline + zlib + zstd + libfido2 + openldap + perl + cyrus_sasl + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + numactl + libtirpc + systemd + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cctools + CoreServices + developer_cmds + DarwinTools + ] + ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) jemalloc + ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) gperftools; + + outputs = [ + "out" + "static" + ]; + + cmakeFlags = + [ + # Percona-specific flags. + "-DPORTABLE=1" + "-DWITH_LDAP=system" + "-DROCKSDB_DISABLE_AVX2=1" + "-DROCKSDB_DISABLE_MARCH_NATIVE=1" + + # Flags taken from mysql package. + "-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin. + "-DWITH_ROUTER=OFF" # It may be packaged separately. + "-DWITH_SYSTEM_LIBS=ON" + "-DWITH_UNIT_TESTS=OFF" + "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DMYSQL_DATADIR=/var/lib/mysql" + "-DINSTALL_INFODIR=share/mysql/docs" + "-DINSTALL_MANDIR=share/man" + "-DINSTALL_PLUGINDIR=lib/mysql/plugin" + "-DINSTALL_INCLUDEDIR=include/mysql" + "-DINSTALL_DOCREADMEDIR=share/mysql" + "-DINSTALL_SUPPORTFILESDIR=share/mysql" + "-DINSTALL_MYSQLSHAREDIR=share/mysql" + "-DINSTALL_MYSQLTESTDIR=" + "-DINSTALL_DOCDIR=share/mysql/docs" + "-DINSTALL_SHAREDIR=share/mysql" + + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + "-DWITH_SYSTEMD=1" + "-DWITH_SYSTEMD_DEBUG=1" + ] + ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) "-DWITH_JEMALLOC=1" + ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) "-DWITH_TCMALLOC=1"; + + postInstall = + '' + moveToOutput "lib/*.a" $static + so=${stdenv.hostPlatform.extensions.sharedLibrary} + ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so + + wrapProgram $out/bin/mysqld_safe --prefix PATH : ${ + lib.makeBinPath [ + coreutils + procps + gnugrep + gnused + hostname + ] + } + wrapProgram $out/bin/mysql_config --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnused + ] + } + wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnugrep + ] + } + wrapProgram $out/bin/ps-admin --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnugrep + ] + } + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + wrapProgram $out/bin/mysqld_multi --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnugrep + ] + } + ''; + + passthru = { + client = finalAttrs.finalPackage; + connector-c = finalAttrs.finalPackage; + server = finalAttrs.finalPackage; + mysqlVersion = lib.versions.majorMinor finalAttrs.version; + tests = nixosTests.mysql.percona-server_innovation; + }; + + meta = with lib; { + homepage = "https://www.percona.com/software/mysql-database/percona-server"; + description = '' + A free, fully compatible, enhanced, open source drop-in replacement for + MySQL® that provides superior performance, scalability and instrumentation. + Long-term support release. + ''; + license = licenses.gpl2; + maintainers = teams.flyingcircus.members; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/servers/sql/percona-server/default.nix b/pkgs/servers/sql/percona-server/default.nix index e7d55c4af962..161d8f179ced 100644 --- a/pkgs/servers/sql/percona-server/default.nix +++ b/pkgs/servers/sql/percona-server/default.nix @@ -8,7 +8,7 @@ pkgs: { # newer versions cause linking failures against `libabsl_spinlock_wait` protobuf = pkgs.protobuf_21; }; - percona-server_8_3 = pkgs.callPackage ./8_3.nix { + percona-server_8_4 = pkgs.callPackage ./8_4.nix { inherit (pkgs.darwin) developer_cmds DarwinTools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; # newer versions cause linking failures against `libabsl_spinlock_wait` diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b6c41d1a382..f128ecf8e98e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11089,9 +11089,10 @@ with pkgs; perceptualdiff = callPackage ../tools/graphics/perceptualdiff { }; - inherit (import ../servers/sql/percona-server pkgs) percona-server_8_0 percona-server_8_3; - percona-server_lts = percona-server_8_0; - percona-server_innovation = percona-server_8_3; + inherit (import ../servers/sql/percona-server pkgs) percona-server_8_0 percona-server_8_4; + percona-server_lts = percona-server_8_4; + # temporarily, latest LTS and Innovation release are equal + percona-server_innovation = percona-server_8_4; percona-server = percona-server_lts; inherit (import ../tools/backup/percona-xtrabackup pkgs) percona-xtrabackup_8_0 percona-xtrabackup_8_3; percona-xtrabackup_lts = percona-xtrabackup_8_0; From b04c93f6f43e41006fe4578fcdf5a5300812d1b6 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Sun, 13 Oct 2024 17:39:54 +0200 Subject: [PATCH 068/108] percona-server_8_0: 8.0.36-28 -> 8.0.37-29 This is a new LTS release as well. --- pkgs/servers/sql/percona-server/8_0.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/percona-server/8_0.nix b/pkgs/servers/sql/percona-server/8_0.nix index 352b0239c429..af3925fc5813 100644 --- a/pkgs/servers/sql/percona-server/8_0.nix +++ b/pkgs/servers/sql/percona-server/8_0.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "percona-server_lts"; - version = "8.0.36-28"; + pname = "percona-server"; + version = "8.0.37-29"; src = fetchurl { url = "https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz"; - hash = "sha256-iktEvZz3mjjmJ16PX51OjSwwiFS3H9W/XRco//Q6aEQ="; + hash = "sha256-zZgq3AxCRYdte3dTUJiuMvVGdl9U01s8jxcAqDxZiNM="; }; nativeBuildInputs = [ @@ -98,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: { description = '' A free, fully compatible, enhanced, open source drop-in replacement for MySQL® that provides superior performance, scalability and instrumentation. + Long-term support release. ''; license = licenses.gpl2Plus; maintainers = teams.flyingcircus.members; From a309521902bc8f80708a9ea08eb00989c276b6c8 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Wed, 2 Oct 2024 18:06:45 +0200 Subject: [PATCH 069/108] percona-xtrabackup_8_0: 8.0.36-30 -> 8.0.35-31 --- pkgs/tools/backup/percona-xtrabackup/8_0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/percona-xtrabackup/8_0.nix b/pkgs/tools/backup/percona-xtrabackup/8_0.nix index fbb4c045d776..04d026ce87d2 100644 --- a/pkgs/tools/backup/percona-xtrabackup/8_0.nix +++ b/pkgs/tools/backup/percona-xtrabackup/8_0.nix @@ -1,8 +1,8 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "8.0.35-30"; - hash = "sha256-yagqBKU057Gk5pEyT2R3c5DtxNG/+TSPenFgbxUiHPo="; + version = "8.0.35-31"; + hash = "sha256-KHfgSi9bQlqsi5aDRBlSpdZgMfOrAwHK51k8KhQ9Udg="; # includes https://github.com/Percona-Lab/libkmip.git fetchSubmodules = true; From 1e514dc39015085ba433e82138d535c07941f8d6 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Wed, 2 Oct 2024 18:07:30 +0200 Subject: [PATCH 070/108] percona-xtrabackup_8_4: init at 8.4.0-1 --- pkgs/tools/backup/percona-xtrabackup/8_3.nix | 15 --------------- pkgs/tools/backup/percona-xtrabackup/8_4.nix | 18 ++++++++++++++++++ .../backup/percona-xtrabackup/default.nix | 2 +- pkgs/top-level/all-packages.nix | 7 ++++--- 4 files changed, 23 insertions(+), 19 deletions(-) delete mode 100644 pkgs/tools/backup/percona-xtrabackup/8_3.nix create mode 100644 pkgs/tools/backup/percona-xtrabackup/8_4.nix diff --git a/pkgs/tools/backup/percona-xtrabackup/8_3.nix b/pkgs/tools/backup/percona-xtrabackup/8_3.nix deleted file mode 100644 index 003df8aa6b50..000000000000 --- a/pkgs/tools/backup/percona-xtrabackup/8_3.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - version = "8.3.0-1"; - hash = "sha256-qZM2AFhpwrN0BR+DdozYn7s2I+c1tWpD5QvppTEfGEY="; - - # includes https://github.com/Percona-Lab/libkmip.git - fetchSubmodules = true; - - extraPatches = [ - ]; - - extraPostInstall = '' - ''; -}) diff --git a/pkgs/tools/backup/percona-xtrabackup/8_4.nix b/pkgs/tools/backup/percona-xtrabackup/8_4.nix new file mode 100644 index 000000000000..0bfcbb12e236 --- /dev/null +++ b/pkgs/tools/backup/percona-xtrabackup/8_4.nix @@ -0,0 +1,18 @@ +{ callPackage, ... }@args: + +callPackage ./generic.nix ( + args + // { + version = "8.4.0-1"; + hash = "sha256-2tWRRYH0P0HZsWTxeuvDeVWvDwqjjdv6J7YiZwoTKtM="; + + # includes https://github.com/Percona-Lab/libkmip.git + fetchSubmodules = true; + + extraPatches = + [ + ]; + + extraPostInstall = ''''; + } +) diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/pkgs/tools/backup/percona-xtrabackup/default.nix index 0cf044ff51c7..8ff666574b4c 100644 --- a/pkgs/tools/backup/percona-xtrabackup/default.nix +++ b/pkgs/tools/backup/percona-xtrabackup/default.nix @@ -2,5 +2,5 @@ pkgs: { percona-xtrabackup_8_0 = pkgs.callPackage ./8_0.nix { boost = pkgs.boost177; }; - percona-xtrabackup_8_3 = pkgs.callPackage ./8_3.nix { }; + percona-xtrabackup_8_4 = pkgs.callPackage ./8_4.nix { }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f128ecf8e98e..c8a19e4641f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11094,9 +11094,10 @@ with pkgs; # temporarily, latest LTS and Innovation release are equal percona-server_innovation = percona-server_8_4; percona-server = percona-server_lts; - inherit (import ../tools/backup/percona-xtrabackup pkgs) percona-xtrabackup_8_0 percona-xtrabackup_8_3; - percona-xtrabackup_lts = percona-xtrabackup_8_0; - percona-xtrabackup_innovation = percona-xtrabackup_8_3; + inherit (import ../tools/backup/percona-xtrabackup pkgs) percona-xtrabackup_8_0 percona-xtrabackup_8_4; + percona-xtrabackup_lts = percona-xtrabackup_8_4; + # temporarily, latest LTS and Innovation release are equal + percona-xtrabackup_innovation = percona-xtrabackup_8_4; percona-xtrabackup = percona-xtrabackup_lts; pick = callPackage ../tools/misc/pick { }; From 8315d06e9967498851141b4391fcd0f0433507bf Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Wed, 2 Oct 2024 18:35:03 +0200 Subject: [PATCH 071/108] percona: release notes for 8.4 LTS release --- nixos/doc/manual/release-notes/rl-2411.section.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 6f2dd011eaf0..20a9cb715e63 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -191,6 +191,10 @@ Also be aware that if you have set additional options in `services.wstunnel.{clients,servers}..extraArgs`, that those might have been removed or modified upstream. +- `percona-server_8_4` and `mysql84` now have password authentication via the deprecated `mysql_native_password` disabled by default. This authentication plugin can be enabled via a CLI argument again, for detailed instructions and alternative authentication methods [see upstream documentation](https://dev.mysql.com/doc/refman/8.4/en/native-pluggable-authentication.html). The config file directive `default_authentication_plugin` has been removed. + +- `percona-server_lts` now points towards the new LTS release `percona-server_8_4`. The previous LTS continues to be supported and is available as `percona-server_8_0`. The same is true for the supporting `percona-xtrabackup` tooling. + - `clang-tools_` packages have been moved into `llvmPackages_` (i.e. `clang-tools_18` is now `llvmPackages_18.clang-tools`). - For convenience, the top-level `clang-tools` attribute remains and is now bound to `llvmPackages.clang-tools`. - Top-level `clang_tools_` attributes are now aliases; these will be removed in a future release. From 8d14fa2886fec877690c6d28cfcdba4503dbbcea Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Wed, 2 Oct 2024 18:46:14 +0200 Subject: [PATCH 072/108] percona: apply nixfmt --- pkgs/servers/sql/percona-server/8_0.nix | 136 +++++++++++++++--- pkgs/tools/backup/percona-xtrabackup/8_0.nix | 29 ++-- .../backup/percona-xtrabackup/generic.nix | 85 +++++++++-- 3 files changed, 201 insertions(+), 49 deletions(-) diff --git a/pkgs/servers/sql/percona-server/8_0.nix b/pkgs/servers/sql/percona-server/8_0.nix index af3925fc5813..a82a4fe8d7a7 100644 --- a/pkgs/servers/sql/percona-server/8_0.nix +++ b/pkgs/servers/sql/percona-server/8_0.nix @@ -1,9 +1,43 @@ -{ lib, stdenv, fetchurl, bison, cmake, pkg-config -, boost, icu, libedit, libevent, lz4, ncurses, openssl, perl, protobuf, re2, readline, zlib, zstd, libfido2 -, numactl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests -, coreutils, procps, gnused, gnugrep, hostname, makeWrapper -# Percona-specific deps -, cyrus_sasl, gnumake, openldap +{ + lib, + stdenv, + fetchurl, + bison, + cmake, + pkg-config, + boost, + icu, + libedit, + libevent, + lz4, + ncurses, + openssl, + perl, + protobuf, + re2, + readline, + zlib, + zstd, + libfido2, + numactl, + cctools, + CoreServices, + developer_cmds, + libtirpc, + rpcsvc-proto, + curl, + DarwinTools, + nixosTests, + coreutils, + procps, + gnused, + gnugrep, + hostname, + makeWrapper, + # Percona-specific deps + cyrus_sasl, + gnumake, + openldap, }: stdenv.mkDerivation (finalAttrs: { @@ -16,9 +50,14 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - bison cmake pkg-config makeWrapper + bison + cmake + pkg-config + makeWrapper # required for scripts/CMakeLists.txt - coreutils gnugrep procps + coreutils + gnugrep + procps ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ]; patches = [ @@ -36,16 +75,41 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "make --" "${gnumake}/bin/make --" ''; - buildInputs = [ - boost (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib - zstd libfido2 openldap perl cyrus_sasl - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - numactl libtirpc - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - cctools CoreServices developer_cmds DarwinTools - ]; + buildInputs = + [ + boost + (curl.override { inherit openssl; }) + icu + libedit + libevent + lz4 + ncurses + openssl + protobuf + re2 + readline + zlib + zstd + libfido2 + openldap + perl + cyrus_sasl + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + numactl + libtirpc + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cctools + CoreServices + developer_cmds + DarwinTools + ]; - outputs = [ "out" "static" ]; + outputs = [ + "out" + "static" + ]; cmakeFlags = [ # Percona-specific flags. @@ -78,11 +142,39 @@ stdenv.mkDerivation (finalAttrs: { so=${stdenv.hostPlatform.extensions.sharedLibrary} ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so - wrapProgram $out/bin/mysqld_safe --prefix PATH : ${lib.makeBinPath [ coreutils procps gnugrep gnused hostname ]} - wrapProgram $out/bin/mysql_config --prefix PATH : ${lib.makeBinPath [ coreutils gnused ]} - wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]} - wrapProgram $out/bin/ps-admin --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]} - wrapProgram $out/bin/mysqld_multi --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]} + wrapProgram $out/bin/mysqld_safe --prefix PATH : ${ + lib.makeBinPath [ + coreutils + procps + gnugrep + gnused + hostname + ] + } + wrapProgram $out/bin/mysql_config --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnused + ] + } + wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnugrep + ] + } + wrapProgram $out/bin/ps-admin --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnugrep + ] + } + wrapProgram $out/bin/mysqld_multi --prefix PATH : ${ + lib.makeBinPath [ + coreutils + gnugrep + ] + } ''; passthru = { diff --git a/pkgs/tools/backup/percona-xtrabackup/8_0.nix b/pkgs/tools/backup/percona-xtrabackup/8_0.nix index 04d026ce87d2..c9822f1ec84c 100644 --- a/pkgs/tools/backup/percona-xtrabackup/8_0.nix +++ b/pkgs/tools/backup/percona-xtrabackup/8_0.nix @@ -1,17 +1,20 @@ -{ callPackage, ... } @ args: +{ callPackage, ... }@args: -callPackage ./generic.nix (args // { - version = "8.0.35-31"; - hash = "sha256-KHfgSi9bQlqsi5aDRBlSpdZgMfOrAwHK51k8KhQ9Udg="; +callPackage ./generic.nix ( + args + // { + version = "8.0.35-31"; + hash = "sha256-KHfgSi9bQlqsi5aDRBlSpdZgMfOrAwHK51k8KhQ9Udg="; - # includes https://github.com/Percona-Lab/libkmip.git - fetchSubmodules = true; + # includes https://github.com/Percona-Lab/libkmip.git + fetchSubmodules = true; - extraPatches = [ - ./abi-check.patch - ]; + extraPatches = [ + ./abi-check.patch + ]; - extraPostInstall = '' - rm -r "$out"/docs - ''; -}) + extraPostInstall = '' + rm -r "$out"/docs + ''; + } +) diff --git a/pkgs/tools/backup/percona-xtrabackup/generic.nix b/pkgs/tools/backup/percona-xtrabackup/generic.nix index d81dee6f97f6..fdb5d9f701f4 100644 --- a/pkgs/tools/backup/percona-xtrabackup/generic.nix +++ b/pkgs/tools/backup/percona-xtrabackup/generic.nix @@ -1,8 +1,36 @@ -{ lib, stdenv, fetchFromGitHub, bison, boost, cmake, makeWrapper, pkg-config -, curl, cyrus_sasl, libaio, libedit, libev, libevent, libgcrypt, libgpg-error, lz4 -, ncurses, numactl, openssl, procps, protobuf, valgrind, xxd, zlib -, perlPackages -, version, hash, fetchSubmodules ? false, extraPatches ? [], extraPostInstall ? "", ... +{ + lib, + stdenv, + fetchFromGitHub, + bison, + boost, + cmake, + makeWrapper, + pkg-config, + curl, + cyrus_sasl, + libaio, + libedit, + libev, + libevent, + libgcrypt, + libgpg-error, + lz4, + ncurses, + numactl, + openssl, + procps, + protobuf, + valgrind, + xxd, + zlib, + perlPackages, + version, + hash, + fetchSubmodules ? false, + extraPatches ? [ ], + extraPostInstall ? "", + ... }: stdenv.mkDerivation (finalAttrs: { @@ -16,12 +44,39 @@ stdenv.mkDerivation (finalAttrs: { inherit hash fetchSubmodules; }; - nativeBuildInputs = [ bison boost cmake makeWrapper pkg-config ]; + nativeBuildInputs = [ + bison + boost + cmake + makeWrapper + pkg-config + ]; - buildInputs = [ - (curl.override { inherit openssl; }) cyrus_sasl libaio libedit libevent libev libgcrypt libgpg-error lz4 - ncurses numactl openssl procps protobuf valgrind xxd zlib - ] ++ (with perlPackages; [ perl DBI DBDmysql ]); + buildInputs = + [ + (curl.override { inherit openssl; }) + cyrus_sasl + libaio + libedit + libevent + libev + libgcrypt + libgpg-error + lz4 + ncurses + numactl + openssl + procps + protobuf + valgrind + xxd + zlib + ] + ++ (with perlPackages; [ + perl + DBI + DBDmysql + ]); patches = extraPatches; @@ -42,10 +97,12 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_MAN_PAGES=OFF" ]; - postInstall = '' - wrapProgram "$out"/bin/xtrabackup --prefix PERL5LIB : $PERL5LIB - rm -r "$out"/lib/plugin/debug - '' + extraPostInstall; + postInstall = + '' + wrapProgram "$out"/bin/xtrabackup --prefix PERL5LIB : $PERL5LIB + rm -r "$out"/lib/plugin/debug + '' + + extraPostInstall; passthru.mysqlVersion = lib.versions.majorMinor finalAttrs.version; From 16a8db078642abcacbeaab8ce4c5267857f18ff2 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Thu, 3 Oct 2024 01:16:00 +0200 Subject: [PATCH 073/108] .git-blame-ignore-revs: add percona reformatting --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 8a25858cfd6a..7d6251cbee9b 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -174,3 +174,6 @@ cffc27daf06c77c0d76bc35d24b929cb9d68c3c9 # fetchurl: nixfmt-rfc-style ce21e97a1f20dee15da85c084f9d1148d84f853b + +# percona: apply nixfmt +8d14fa2886fec877690c6d28cfcdba4503dbbcea From 482a6800ab86320f58d8eb157b8c57398968a0be Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 13 Oct 2024 16:34:14 -0400 Subject: [PATCH 074/108] nushellPlugins.net: 1.7.0 -> 1.8.0 --- pkgs/shells/nushell/plugins/net.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/plugins/net.nix b/pkgs/shells/nushell/plugins/net.nix index 981f1d208e11..f0af1af66081 100644 --- a/pkgs/shells/nushell/plugins/net.nix +++ b/pkgs/shells/nushell/plugins/net.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "nu-plugin-net"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "fennewald"; repo = "nu_plugin_net"; rev = "refs/tags/${version}"; - hash = "sha256-GOF2CSlsjI8PAmIxj/+mR01X5XMviEM8gj7ZYTbeX7I="; + hash = "sha256-nKcB919M9FkDloulh9IusWYPhf8vlhUmKVs6Gd6w3Bw="; }; - cargoHash = "sha256-2FjKGirjTb6ZjDmhK9ciQzVtWCF8CcYeA+YXcr1oMP4="; + cargoHash = "sha256-3FMalpgKYZ4xM2fHXTFOVu5I8yS06K1bDiKg4we7jF4="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; From 4b5141e0189a07f54f0842570ac03492fe5c6d97 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Sun, 13 Oct 2024 20:34:54 +0200 Subject: [PATCH 075/108] percona: deprecate innovation/lts release flavours Percona upstream has decided not to create releases or each MySQL innovation upstream release, but just for LTS releases. https://www.percona.com/blog/no-mysql-9-x-innovation-releases-from-percona/ --- nixos/doc/manual/release-notes/rl-2411.section.md | 3 ++- pkgs/servers/sql/percona-server/default.nix | 1 + pkgs/tools/backup/percona-xtrabackup/default.nix | 1 + pkgs/top-level/aliases.nix | 4 ++++ pkgs/top-level/all-packages.nix | 12 ++---------- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 20a9cb715e63..4c32ad992167 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -193,7 +193,8 @@ - `percona-server_8_4` and `mysql84` now have password authentication via the deprecated `mysql_native_password` disabled by default. This authentication plugin can be enabled via a CLI argument again, for detailed instructions and alternative authentication methods [see upstream documentation](https://dev.mysql.com/doc/refman/8.4/en/native-pluggable-authentication.html). The config file directive `default_authentication_plugin` has been removed. -- `percona-server_lts` now points towards the new LTS release `percona-server_8_4`. The previous LTS continues to be supported and is available as `percona-server_8_0`. The same is true for the supporting `percona-xtrabackup` tooling. +- Percona has decided not to follow the LTS/ Innovation release scheme of upstream MySQL and thus [will only create releases for MySQL LTS versions](https://www.percona.com/blog/no-mysql-9-x-innovation-releases-from-percona/). Hence, the package names `percona-server_lts`, `percona-server_innovation`, `percona-xtrabackup_lts` and `percona-xtrabackup_innovation` are deprecated. + - `percona-server` and `percona-server_lts` now point towards the new LTS release `percona-server_8_4`. The previous LTS continues to be supported and is available as `percona-server_8_0`. The same is true for the supporting `percona-xtrabackup` tooling. - `clang-tools_` packages have been moved into `llvmPackages_` (i.e. `clang-tools_18` is now `llvmPackages_18.clang-tools`). - For convenience, the top-level `clang-tools` attribute remains and is now bound to `llvmPackages.clang-tools`. diff --git a/pkgs/servers/sql/percona-server/default.nix b/pkgs/servers/sql/percona-server/default.nix index 161d8f179ced..aaac48de68ff 100644 --- a/pkgs/servers/sql/percona-server/default.nix +++ b/pkgs/servers/sql/percona-server/default.nix @@ -14,4 +14,5 @@ pkgs: { # newer versions cause linking failures against `libabsl_spinlock_wait` protobuf = pkgs.protobuf_21; }; + percona-server = pkgs.percona-server_8_4; } diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/pkgs/tools/backup/percona-xtrabackup/default.nix index 8ff666574b4c..9fd2e627c17e 100644 --- a/pkgs/tools/backup/percona-xtrabackup/default.nix +++ b/pkgs/tools/backup/percona-xtrabackup/default.nix @@ -3,4 +3,5 @@ pkgs: { boost = pkgs.boost177; }; percona-xtrabackup_8_4 = pkgs.callPackage ./8_4.nix { }; + percona-xtrabackup = pkgs.percona-xtrabackup_8_4; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 313b9fd7b687..3cb9749864a0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1212,6 +1212,10 @@ mapAliases { pcsxr = throw "pcsxr was removed as it has been abandoned for over a decade; please use DuckStation, Mednafen, or the RetroArch PCSX ReARMed core"; # Added 2024-08-20 pdf2xml = throw "'pdf2xml' was removed: abandoned for years."; # Added 2023-10-22 peach = asouldocs; # Added 2022-08-28 + percona-server_innovation = lib.warn "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-server; # Added 2024-10-13 + percona-server_lts = percona-server; # Added 2024-10-13 + percona-xtrabackup_innovation = lib.warn "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-xtrabackup; # Added 2024-10-13 + percona-xtrabackup_lts = percona-xtrabackup; # Added 2024-10-13 pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23 perldevel = throw "'perldevel' has been dropped due to lack of updates in nixpkgs and lack of consistent support for devel versions by 'perl-cross' releases, use 'perl' instead"; perldevelPackages = perldevel; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8a19e4641f7..70cd16965e9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11089,16 +11089,8 @@ with pkgs; perceptualdiff = callPackage ../tools/graphics/perceptualdiff { }; - inherit (import ../servers/sql/percona-server pkgs) percona-server_8_0 percona-server_8_4; - percona-server_lts = percona-server_8_4; - # temporarily, latest LTS and Innovation release are equal - percona-server_innovation = percona-server_8_4; - percona-server = percona-server_lts; - inherit (import ../tools/backup/percona-xtrabackup pkgs) percona-xtrabackup_8_0 percona-xtrabackup_8_4; - percona-xtrabackup_lts = percona-xtrabackup_8_4; - # temporarily, latest LTS and Innovation release are equal - percona-xtrabackup_innovation = percona-xtrabackup_8_4; - percona-xtrabackup = percona-xtrabackup_lts; + inherit (import ../servers/sql/percona-server pkgs) percona-server_8_0 percona-server_8_4 percona-server; + inherit (import ../tools/backup/percona-xtrabackup pkgs) percona-xtrabackup_8_0 percona-xtrabackup_8_4 percona-xtrabackup; pick = callPackage ../tools/misc/pick { }; From 6d0da9a167b688525dc7c7f778104ad3126c7bd6 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Sun, 13 Oct 2024 20:58:42 +0200 Subject: [PATCH 076/108] tests/mysql: properly specify percona packages --- nixos/tests/mysql/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/mysql/common.nix b/nixos/tests/mysql/common.nix index ad54b0e00c1b..079eff163b1c 100644 --- a/nixos/tests/mysql/common.nix +++ b/nixos/tests/mysql/common.nix @@ -4,7 +4,7 @@ inherit (pkgs) mysql80; }; perconaPackages = { - inherit (pkgs) percona-server_lts percona-server_innovation; + inherit (pkgs) percona-server_8_0 percona-server_8_4; }; mkTestName = pkg: "mariadb_${builtins.replaceStrings ["."] [""] (lib.versions.majorMinor pkg.version)}"; } From f02bd5b0fccb9b9365fe3d219a88df3cff78c914 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Sun, 13 Oct 2024 22:56:01 +0200 Subject: [PATCH 077/108] percona: correct licensing information Corrects the partially wrong change from #313931, all Oracle MySQL derivates are actually GPLv2 only. --- pkgs/servers/sql/percona-server/8_0.nix | 2 +- pkgs/servers/sql/percona-server/8_4.nix | 2 +- pkgs/tools/backup/percona-xtrabackup/generic.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/percona-server/8_0.nix b/pkgs/servers/sql/percona-server/8_0.nix index a82a4fe8d7a7..1d1a64e31643 100644 --- a/pkgs/servers/sql/percona-server/8_0.nix +++ b/pkgs/servers/sql/percona-server/8_0.nix @@ -192,7 +192,7 @@ stdenv.mkDerivation (finalAttrs: { MySQL® that provides superior performance, scalability and instrumentation. Long-term support release. ''; - license = licenses.gpl2Plus; + license = licenses.gpl2Only; maintainers = teams.flyingcircus.members; platforms = platforms.unix; }; diff --git a/pkgs/servers/sql/percona-server/8_4.nix b/pkgs/servers/sql/percona-server/8_4.nix index 6ed5e077b40a..0b68f84d4b12 100644 --- a/pkgs/servers/sql/percona-server/8_4.nix +++ b/pkgs/servers/sql/percona-server/8_4.nix @@ -214,7 +214,7 @@ stdenv.mkDerivation (finalAttrs: { MySQL® that provides superior performance, scalability and instrumentation. Long-term support release. ''; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = teams.flyingcircus.members; platforms = platforms.unix; }; diff --git a/pkgs/tools/backup/percona-xtrabackup/generic.nix b/pkgs/tools/backup/percona-xtrabackup/generic.nix index fdb5d9f701f4..3f4cdd86cf10 100644 --- a/pkgs/tools/backup/percona-xtrabackup/generic.nix +++ b/pkgs/tools/backup/percona-xtrabackup/generic.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Non-blocking backup tool for MySQL"; homepage = "http://www.percona.com/software/percona-xtrabackup"; - license = licenses.lgpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = teams.flyingcircus.members ++ [ maintainers.izorkin ]; }; From c4c40cd72ace233437539581a21eb9bc471a538d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Oct 2024 23:19:04 +0200 Subject: [PATCH 078/108] felix-fm: 2.13.0 -> 2.14.0 Diff: https://github.com/kyoheiu/felix/compare/refs/tags/v2.13.0...v2.14.0 Changelog: https://github.com/kyoheiu/felix/blob/v2.14.0/CHANGELOG.md --- pkgs/by-name/fe/felix-fm/package.nix | 39 +++++++++++----------------- 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/fe/felix-fm/package.nix b/pkgs/by-name/fe/felix-fm/package.nix index 7b938a93c01d..ff704f6d27cb 100644 --- a/pkgs/by-name/fe/felix-fm/package.nix +++ b/pkgs/by-name/fe/felix-fm/package.nix @@ -1,37 +1,28 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, fetchpatch2 -, pkg-config -, bzip2 -, libgit2 -, nix-update-script -, zlib -, zstd -, zoxide +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + bzip2, + libgit2, + nix-update-script, + zlib, + zstd, + zoxide, }: rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "kyoheiu"; repo = "felix"; - rev = "v${version}"; - hash = "sha256-7KuL3YkKhjcZSMSipbNITaA9/MGo54f3lz3fVOgy52s="; + rev = "refs/tags/v${version}"; + hash = "sha256-PcC0lZ41qTVE4V3VdwBq83qYfEJO3RJouuS2+bpcBfo="; }; - cargoPatches = [ - # https://github.com/kyoheiu/felix/pull/292 - (fetchpatch2 { - name = "update-cargo.lock-for-2.13.0.patch"; - url = "https://github.com/kyoheiu/felix/commit/5085b147103878ee8138d4fcf7b204223ba2c3eb.patch"; - hash = "sha256-7Bga9hcJCXExA/jnrR/HuZgOOVBbWs1tdTwxldcvdU8="; - }) - ]; - - cargoHash = "sha256-FX3AsahU5ZLMuylwo1jihP9G4Dw1SFv1oMXcuOqDTF8="; + cargoHash = "sha256-4tvk7H2CrTx9m1f0PLnNv+LWg6oIGTUfirRhIaz2lHo="; nativeBuildInputs = [ pkg-config ]; From de085eaf7ac2a867fe6af7b1039f1d66eb3d6ce9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Oct 2024 23:22:14 +0200 Subject: [PATCH 079/108] ttop: 1.5.2 -> 1.5.3 Diff: https://github.com/inv2004/ttop/compare/v1.5.2...v1.5.3 Changelog: https://github.com/inv2004/ttop/releases/tag/v1.5.3 --- pkgs/by-name/tt/ttop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tt/ttop/package.nix b/pkgs/by-name/tt/ttop/package.nix index 041ecff72011..8a5890534dfb 100644 --- a/pkgs/by-name/tt/ttop/package.nix +++ b/pkgs/by-name/tt/ttop/package.nix @@ -2,13 +2,13 @@ buildNimPackage (finalAttrs: { pname = "ttop"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "inv2004"; repo = "ttop"; rev = "v${finalAttrs.version}"; - hash = "sha256-/rs5JjTXxptVHXL3fY8qP6Be3r5N871CEbUH7w6zx4A="; + hash = "sha256-KfPlO0RmahavA3dsxNDozuNOXIRAwDTtT+zFaF6hYd0="; }; lockFile = ./lock.json; From 95688b938d0d6c1aaabc9bb821df1850bb71e992 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 13 Oct 2024 23:22:33 +0200 Subject: [PATCH 080/108] ttop: format with nixfmt --- pkgs/by-name/tt/ttop/package.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tt/ttop/package.nix b/pkgs/by-name/tt/ttop/package.nix index 8a5890534dfb..549ba705b98f 100644 --- a/pkgs/by-name/tt/ttop/package.nix +++ b/pkgs/by-name/tt/ttop/package.nix @@ -1,4 +1,9 @@ -{ lib, buildNimPackage, fetchFromGitHub, testers }: +{ + lib, + buildNimPackage, + fetchFromGitHub, + testers, +}: buildNimPackage (finalAttrs: { pname = "ttop"; @@ -29,7 +34,10 @@ buildNimPackage (finalAttrs: { changelog = "https://github.com/inv2004/ttop/releases/tag/${finalAttrs.src.rev}"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ figsoda sikmir ]; + maintainers = with maintainers; [ + figsoda + sikmir + ]; mainProgram = "ttop"; }; }) From 4e882da3af28f4d0fb08124d4814ac79f884d3b6 Mon Sep 17 00:00:00 2001 From: Solomon Victorino Date: Sun, 13 Oct 2024 16:57:36 -0600 Subject: [PATCH 081/108] oqs-provider: fix hash for retagged 0.7.0 Diff: https://github.com/open-quantum-safe/oqs-provider/compare/7b6928e63d45cfb72487177748b63c7c8adc559d..f4a996fcf0a6fadcc11fde8c066ab95ec13223a0 --- pkgs/by-name/oq/oqs-provider/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/oq/oqs-provider/package.nix b/pkgs/by-name/oq/oqs-provider/package.nix index 17f73913fcfb..105ce97a0684 100644 --- a/pkgs/by-name/oq/oqs-provider/package.nix +++ b/pkgs/by-name/oq/oqs-provider/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "open-quantum-safe"; repo = "oqs-provider"; rev = finalAttrs.version; - hash = "sha256-2+TpYpZwC8vx6tGgS2waD/BQDfnbq0PJIwvX5wDDBEg="; + hash = "sha256-v7YIE5uzBvQHfi2hqkkRrW0F3K4haZyuoKHxAtRqQDA="; }; nativeBuildInputs = [ From cd2a4e6ba1570925a658b75f50eb6dbca98d07ed Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 1 Oct 2024 08:56:29 +0200 Subject: [PATCH 082/108] python312Packages.cohere: 5.10.0 -> 5.11.0 Diff: https://github.com/cohere-ai/cohere-python/compare/refs/tags/5.10.0...5.11.0 Changelog: https://github.com/cohere-ai/cohere-python/releases/tag/5.11.0 --- pkgs/development/python-modules/cohere/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index 79fcf2764bd3..90b3423ac353 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -15,6 +15,7 @@ pydantic, pydantic-core, requests, + sagemaker, tokenizers, types-requests, typing-extensions, @@ -22,14 +23,14 @@ buildPythonPackage rec { pname = "cohere"; - version = "5.10.0"; + version = "5.11.0"; pyproject = true; src = fetchFromGitHub { owner = "cohere-ai"; repo = "cohere-python"; rev = "refs/tags/${version}"; - hash = "sha256-9d72JWEz2L8yyZQKkdwQMgwQM3nz4yVHnmVCERaa5C8="; + hash = "sha256-KhONCdIGKYbIcFG+zv6uXSiX+crsmgPZUU+5NsSWaA8="; }; build-system = [ poetry-core ]; @@ -43,6 +44,7 @@ buildPythonPackage rec { pydantic pydantic-core requests + sagemaker tokenizers types-requests typing-extensions From 47ba1c051206d7415e81094188fb501ed59e0cfd Mon Sep 17 00:00:00 2001 From: John Chadwick Date: Sun, 13 Oct 2024 21:48:12 -0400 Subject: [PATCH 083/108] bear: reformat using RFC style --- .../tools/build-managers/bear/default.nix | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 13f16c9171b6..7ad10220c053 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -1,21 +1,23 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake -, ninja -, pkg-config -, grpc -, protobuf -, openssl -, nlohmann_json -, gtest -, spdlog -, c-ares -, zlib -, sqlite -, re2 -, lit -, python3 -, coreutils +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + pkg-config, + grpc, + protobuf, + openssl, + nlohmann_json, + gtest, + spdlog, + c-ares, + zlib, + sqlite, + re2, + lit, + python3, + coreutils, }: stdenv.mkDerivation rec { From 6eb298a40f902220428aba21e9cc066d88008072 Mon Sep 17 00:00:00 2001 From: John Chadwick Date: Sun, 13 Oct 2024 21:48:46 -0400 Subject: [PATCH 084/108] bear: fix build failure --- pkgs/development/tools/build-managers/bear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 7ad10220c053..489181187c4e 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -6,7 +6,7 @@ ninja, pkg-config, grpc, - protobuf, + protobuf_25, openssl, nlohmann_json, gtest, @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ grpc - protobuf + protobuf_25 openssl nlohmann_json gtest From b0d40191821b6eaf56729d5f2c1e59805369119f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Oct 2024 03:01:14 +0000 Subject: [PATCH 085/108] mingtest: 0.1.9 -> 0.2.1 --- pkgs/by-name/mi/mingtest/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/mingtest/package.nix b/pkgs/by-name/mi/mingtest/package.nix index 78ea3d7b995c..af847cd2f77b 100644 --- a/pkgs/by-name/mi/mingtest/package.nix +++ b/pkgs/by-name/mi/mingtest/package.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "mingtest"; - version = "0.1.9"; + version = "0.2.1"; src = fetchFromGitHub { owner = "craflin"; repo = "mingtest"; rev = "refs/tags/${version}"; - hash = "sha256-Iy2KvFCFk+uoztTVxTY7HMdc5GI4gSGqGmbJePJ5CO8="; + hash = "sha256-buFr5w+3YJ2gJeQ8YTsFrUMU9hWq/iAJ6cW6ykvETfM="; }; postPatch = '' From c1a4971921adac208da84ed97cc1ff44286fd934 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Oct 2024 04:02:10 +0000 Subject: [PATCH 086/108] kdePackages.klevernotes: 1.0.0 -> 1.1.0 --- pkgs/kde/misc/klevernotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/kde/misc/klevernotes/default.nix b/pkgs/kde/misc/klevernotes/default.nix index 3998a5a940da..ae66125fddf4 100644 --- a/pkgs/kde/misc/klevernotes/default.nix +++ b/pkgs/kde/misc/klevernotes/default.nix @@ -7,11 +7,11 @@ }: mkKdeDerivation rec { pname = "klevernotes"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { url = "mirror://kde/stable/klevernotes/${version}/klevernotes-${version}.tar.xz"; - hash = "sha256-9nXOaa2/DyJO3nXGbnvPaYjXFrVoAgx52th67l5geOU="; + hash = "sha256-YkIBYlTvweSg4CMqj+sHoNyZJXuwpCAMNZUZUyH2dYE="; }; extraBuildInputs = [ From 15fb0f315b5cd21f0489db036e3acc8f63e4f3bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Oct 2024 05:34:42 +0000 Subject: [PATCH 087/108] unrar-free: 0.3.0 -> 0.3.1 --- pkgs/by-name/un/unrar-free/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/un/unrar-free/package.nix b/pkgs/by-name/un/unrar-free/package.nix index 72ca626c8933..de058108efae 100644 --- a/pkgs/by-name/un/unrar-free/package.nix +++ b/pkgs/by-name/un/unrar-free/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "unrar-free"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitLab { owner = "bgermann"; repo = "unrar-free"; rev = finalAttrs.version; - hash = "sha256-hVUEvlaVx2Ai1lYXU6hwiLToEMhCPWlSIh1WrbYKmco="; + hash = "sha256-Dg+KGZcqbE1nBPaemZlWQPaUQQJmaSe0nyDQRXJzwuE="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 95955652cae6126fd66b2b2b7307d594a50adece Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Oct 2024 06:00:18 +0000 Subject: [PATCH 088/108] supergfxctl: 5.2.1 -> 5.2.4 --- pkgs/applications/system/supergfxctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/system/supergfxctl/default.nix b/pkgs/applications/system/supergfxctl/default.nix index 3fd0182e66a2..2318a4c96725 100644 --- a/pkgs/applications/system/supergfxctl/default.nix +++ b/pkgs/applications/system/supergfxctl/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "supergfxctl"; - version = "5.2.1"; + version = "5.2.4"; src = fetchFromGitLab { owner = "asus-linux"; repo = "supergfxctl"; rev = version; - hash = "sha256-gjMLyT3pvQhmjz9SFbYlDAqg+tCX5ORkCkcnyBzO5ws="; + hash = "sha256-ie5JPHBvypUtPStwA/aO4GeQ/qbHTzUJF3T4QuW6JNc="; }; - cargoHash = "sha256-ndugyiAYPDyue2Ajxx22BNvYc9iBTxZqP5OxaqmC7U0="; + cargoHash = "sha256-qZC4axeRnKgUNGDFzmdvN/mwkcqsh8KwLlM6oGT19e8="; postPatch = '' substituteInPlace data/supergfxd.service --replace /usr/bin/supergfxd $out/bin/supergfxd From ffd9d8f0f11548303f6d9e7dc9846d40e2bcdd41 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 13 Oct 2024 14:38:48 +0200 Subject: [PATCH 089/108] justbuild: format --- pkgs/by-name/ju/justbuild/package.nix | 100 +++++++++++++------------- 1 file changed, 51 insertions(+), 49 deletions(-) diff --git a/pkgs/by-name/ju/justbuild/package.nix b/pkgs/by-name/ju/justbuild/package.nix index 86274edd4f3e..89ab1be89b99 100644 --- a/pkgs/by-name/ju/justbuild/package.nix +++ b/pkgs/by-name/ju/justbuild/package.nix @@ -24,7 +24,8 @@ curl, libarchive, }: -let stdenv = gccStdenv; +let + stdenv = gccStdenv; in stdenv.mkDerivation rec { pname = "justbuild"; @@ -47,31 +48,30 @@ stdenv.mkDerivation rec { hash = "sha256-W7awJTzPZLU9bHJJYlp+P2w7xkAqvVLTd4v6SCWHA6A="; }; - nativeBuildInputs = - [ - # Tools for the bootstrap process - jq - pkg-config - python3 - unzip - wget - coreutils + nativeBuildInputs = [ + # Tools for the bootstrap process + jq + pkg-config + python3 + unzip + wget + coreutils - # Dependencies of just - cli11 - # Using fmt 10 because this is the same version upstream currently - # uses for bundled builds - # For future updates: The currently used version can be found in the file - # etc/repos.json: https://github.com/just-buildsystem/justbuild/blob/master/etc/repos.json - # under the key .repositories.fmt - fmt_10 - microsoft-gsl - nlohmann_json + # Dependencies of just + cli11 + # Using fmt 10 because this is the same version upstream currently + # uses for bundled builds + # For future updates: The currently used version can be found in the file + # etc/repos.json: https://github.com/just-buildsystem/justbuild/blob/master/etc/repos.json + # under the key .repositories.fmt + fmt_10 + microsoft-gsl + nlohmann_json - # Dependencies of the compiled just-mr - curl - libarchive - ]; + # Dependencies of the compiled just-mr + curl + libarchive + ]; buildInputs = [ grpc @@ -81,34 +81,36 @@ stdenv.mkDerivation rec { python3 ]; - postPatch = '' - sed -ie 's|\./bin/just-mr.py|${python3}/bin/python3 ./bin/just-mr.py|' bin/bootstrap.py - sed -ie 's|#!/usr/bin/env python3|#!${python3}/bin/python3|' bin/parallel-bootstrap-traverser.py - jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf_25}"' etc/repos.json > etc/repos.json.patched - mv etc/repos.json.patched etc/repos.json - jq '.repositories.com_github_grpc_grpc.pkg_bootstrap.local_path = "${grpc}"' etc/repos.json > etc/repos.json.patched - mv etc/repos.json.patched etc/repos.json - jq '.unknown.PATH = []' etc/toolchain/CC/TARGETS > etc/toolchain/CC/TARGETS.patched - mv etc/toolchain/CC/TARGETS.patched etc/toolchain/CC/TARGETS - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - sed -ie 's|-Wl,-z,stack-size=8388608|-Wl,-stack_size,0x800000|' bin/bootstrap.py - ''; + postPatch = + '' + sed -ie 's|\./bin/just-mr.py|${python3}/bin/python3 ./bin/just-mr.py|' bin/bootstrap.py + sed -ie 's|#!/usr/bin/env python3|#!${python3}/bin/python3|' bin/parallel-bootstrap-traverser.py + jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf_25}"' etc/repos.json > etc/repos.json.patched + mv etc/repos.json.patched etc/repos.json + jq '.repositories.com_github_grpc_grpc.pkg_bootstrap.local_path = "${grpc}"' etc/repos.json > etc/repos.json.patched + mv etc/repos.json.patched etc/repos.json + jq '.unknown.PATH = []' etc/toolchain/CC/TARGETS > etc/toolchain/CC/TARGETS.patched + mv etc/toolchain/CC/TARGETS.patched etc/toolchain/CC/TARGETS + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + sed -ie 's|-Wl,-z,stack-size=8388608|-Wl,-stack_size,0x800000|' bin/bootstrap.py + ''; - /* The build phase follows the bootstrap procedure that is explained in - https://github.com/just-buildsystem/justbuild/blob/master/INSTALL.md + /* + The build phase follows the bootstrap procedure that is explained in + https://github.com/just-buildsystem/justbuild/blob/master/INSTALL.md - The bootstrap of the just binary depends on two proto libraries, which are - supplied as external distfiles. + The bootstrap of the just binary depends on two proto libraries, which are + supplied as external distfiles. - The microsoft-gsl library does not provide a pkg-config file, so one is - created here. In case also the GNU Scientific Library would be used (which - has also the pkg-config name gsl) this would cause a conflict. However, it - is very unlikely that a build tool will ever depend on a GPL math library. - - The extra build flags (ADD_CFLAGS and ADD_CXXFLAGS) are only needed in the - current version of just, the next release will contain a fix from upstream. - https://github.com/just-buildsystem/justbuild/commit/5abcd4140a91236c7bda1c21ce69e76a28da7c8a + The microsoft-gsl library does not provide a pkg-config file, so one is + created here. In case also the GNU Scientific Library would be used (which + has also the pkg-config name gsl) this would cause a conflict. However, it + is very unlikely that a build tool will ever depend on a GPL math library. + The extra build flags (ADD_CFLAGS and ADD_CXXFLAGS) are only needed in the + current version of just, the next release will contain a fix from upstream. + https://github.com/just-buildsystem/justbuild/commit/5abcd4140a91236c7bda1c21ce69e76a28da7c8a */ buildPhase = '' @@ -170,6 +172,6 @@ stdenv.mkDerivation rec { description = "Generic build tool"; homepage = "https://github.com/just-buildsystem/justbuild"; license = licenses.asl20; - maintainers = with maintainers; [clkamp]; + maintainers = with maintainers; [ clkamp ]; }; } From 8c4502b9efce0d079262c9c832a055796bace96a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 13 Oct 2024 14:39:00 +0200 Subject: [PATCH 090/108] justbuild: 1.3.1 -> 1.3.2 Diff: https://github.com/just-buildsystem/justbuild/compare/v1.3.1...v1.3.2 Changelog: https://github.com/just-buildsystem/justbuild/releases/tag/v1.3.2 --- pkgs/by-name/ju/justbuild/package.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ju/justbuild/package.nix b/pkgs/by-name/ju/justbuild/package.nix index 89ab1be89b99..89dc1b6f2d50 100644 --- a/pkgs/by-name/ju/justbuild/package.nix +++ b/pkgs/by-name/ju/justbuild/package.nix @@ -29,13 +29,13 @@ let in stdenv.mkDerivation rec { pname = "justbuild"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "just-buildsystem"; repo = "justbuild"; - rev = "v${version}"; - hash = "sha256-kv7HpDEYZml5uk06s8Cxt5rEpxaJBz9s+or6Od1q4Io="; + rev = "refs/tags/v${version}"; + hash = "sha256-N9K1n2ttxhD0q2BXprt/nQdQseUtpaFmEZUcxRJV5C8="; }; bazelapi = fetchurl { @@ -167,11 +167,13 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { broken = stdenv.hostPlatform.isDarwin; description = "Generic build tool"; homepage = "https://github.com/just-buildsystem/justbuild"; - license = licenses.asl20; - maintainers = with maintainers; [ clkamp ]; + changelog = "https://github.com/just-buildsystem/justbuild/releases/tag/v${version}"; + mainProgram = "just"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ clkamp ]; }; } From a9679031d9fac9ef67422626b655f2b008841ef9 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 13 Oct 2024 15:01:29 +0200 Subject: [PATCH 091/108] justbuild: add tests.version test --- pkgs/by-name/ju/justbuild/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/ju/justbuild/package.nix b/pkgs/by-name/ju/justbuild/package.nix index 89dc1b6f2d50..d80cff4e7800 100644 --- a/pkgs/by-name/ju/justbuild/package.nix +++ b/pkgs/by-name/ju/justbuild/package.nix @@ -23,6 +23,9 @@ curl, libarchive, + + testers, + justbuild, }: let stdenv = gccStdenv; @@ -167,6 +170,14 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru = { + tests.version = testers.testVersion { + package = justbuild; + command = "just version"; + version = builtins.replaceStrings [ "." ] [ "," ] version; + }; + }; + meta = { broken = stdenv.hostPlatform.isDarwin; description = "Generic build tool"; From 7de2696dc2ae8c4a7326e2c469abf38ba5c86e3a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 13 Oct 2024 15:01:35 +0200 Subject: [PATCH 092/108] justbuild: add update script --- pkgs/by-name/ju/justbuild/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ju/justbuild/package.nix b/pkgs/by-name/ju/justbuild/package.nix index d80cff4e7800..437d264560cc 100644 --- a/pkgs/by-name/ju/justbuild/package.nix +++ b/pkgs/by-name/ju/justbuild/package.nix @@ -24,6 +24,7 @@ curl, libarchive, + nix-update-script, testers, justbuild, }: @@ -171,6 +172,7 @@ stdenv.mkDerivation rec { ''; passthru = { + updateScript = nix-update-script { }; tests.version = testers.testVersion { package = justbuild; command = "just version"; From 310061a7f9d3bf03c4bb762dc5dca99f7246979e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 13 Oct 2024 15:03:41 +0200 Subject: [PATCH 093/108] justbuild: use default version of protobuf --- pkgs/by-name/ju/justbuild/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ju/justbuild/package.nix b/pkgs/by-name/ju/justbuild/package.nix index 437d264560cc..188275786501 100644 --- a/pkgs/by-name/ju/justbuild/package.nix +++ b/pkgs/by-name/ju/justbuild/package.nix @@ -11,7 +11,7 @@ openssl, pkg-config, - protobuf_25, + protobuf, grpc, pandoc, python3, @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { grpc libgit2 openssl - protobuf_25 + protobuf python3 ]; @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { '' sed -ie 's|\./bin/just-mr.py|${python3}/bin/python3 ./bin/just-mr.py|' bin/bootstrap.py sed -ie 's|#!/usr/bin/env python3|#!${python3}/bin/python3|' bin/parallel-bootstrap-traverser.py - jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf_25}"' etc/repos.json > etc/repos.json.patched + jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf}"' etc/repos.json > etc/repos.json.patched mv etc/repos.json.patched etc/repos.json jq '.repositories.com_github_grpc_grpc.pkg_bootstrap.local_path = "${grpc}"' etc/repos.json > etc/repos.json.patched mv etc/repos.json.patched etc/repos.json From 892c80bfc3a6892ae49d536f177842be7cc86127 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Oct 2024 08:27:40 +0200 Subject: [PATCH 094/108] python312Packages.meshtastic: 2.5.1 -> 2.5.2 Diff: https://github.com/meshtastic/Meshtastic-python/compare/refs/tags/2.5.1...2.5.2 Changelog: https://github.com/meshtastic/python/releases/tag/2.5.2 --- pkgs/development/python-modules/meshtastic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index e3a5bf6a39b7..588781834230 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.5.1"; + version = "2.5.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-LyWb7BWwRi0Q/dOZkFu/FwOBIqR2mPr3c8/mpsqw/ec="; + hash = "sha256-k2i6oZudY59CmFt5qlWCCtZgywcbLHR9OUYIannSZ20="; }; pythonRelaxDeps = [ From 0932441e91d13ea710cc60439fb006828d40350d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Oct 2024 12:57:47 +0000 Subject: [PATCH 095/108] miniaudicle: 1.5.2.0 -> 1.5.3.0 --- pkgs/applications/audio/miniaudicle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/miniaudicle/default.nix b/pkgs/applications/audio/miniaudicle/default.nix index 25ab4f7c6b71..7899e408068f 100644 --- a/pkgs/applications/audio/miniaudicle/default.nix +++ b/pkgs/applications/audio/miniaudicle/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miniaudicle"; - version = "1.5.2.0"; + version = "1.5.3.0"; src = fetchFromGitHub { owner = "ccrma"; repo = "miniAudicle"; rev = "chuck-${finalAttrs.version}"; - hash = "sha256-jpPF2Qx/6tiotsj92m1XmxsEUgtm5029ijpu3O8B9qM="; + hash = "sha256-iLmTliJXaYDM5X+s3HsXLFO2qonh18BaiWiTdDXKWjk="; fetchSubmodules = true; }; From 52549e634938aa7df9b2e2c13754b5a392884a44 Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Mon, 14 Oct 2024 08:34:01 +0200 Subject: [PATCH 096/108] nemu: fix build --- pkgs/by-name/ne/nemu/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ne/nemu/package.nix b/pkgs/by-name/ne/nemu/package.nix index c57b4dca6ec4..5f543e13cffb 100644 --- a/pkgs/by-name/ne/nemu/package.nix +++ b/pkgs/by-name/ne/nemu/package.nix @@ -50,7 +50,6 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - busybox # for start-stop-daemon coreutils dbus gettext From ec935787a1dee137a4ae003f16ed8e98ecd45e39 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 14 Oct 2024 08:29:07 +0200 Subject: [PATCH 097/108] hatch: 1.12.0 -> 1.13.0 Diff: https://github.com/pypa/hatch/compare/refs/tags/hatch-v1.12.0...hatch-v1.13.0 Changelog: https://github.com/pypa/hatch/blob/hatch-v1.13.0/docs/history/hatch.md --- pkgs/by-name/ha/hatch/package.nix | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ha/hatch/package.nix b/pkgs/by-name/ha/hatch/package.nix index ef827725267e..b4e5b6c42c5b 100644 --- a/pkgs/by-name/ha/hatch/package.nix +++ b/pkgs/by-name/ha/hatch/package.nix @@ -1,27 +1,26 @@ { lib, + stdenv, python3Packages, fetchFromGitHub, replaceVars, git, cargo, - stdenv, + versionCheckHook, darwin, nix-update-script, - testers, - hatch, }: python3Packages.buildPythonApplication rec { pname = "hatch"; - version = "1.12.0"; + version = "1.13.0"; pyproject = true; src = fetchFromGitHub { owner = "pypa"; repo = "hatch"; rev = "refs/tags/hatch-v${version}"; - hash = "sha256-HW2vDVsFrdFRRaPNuGDg9DZpJd8OuYDIqA3KQRa3m9o="; + hash = "sha256-jD8mr0PXlGK9YkBPZhNTimuxmq6dJG7cfQP/UEmHTZY="; }; patches = [ (replaceVars ./paths.patch { uv = lib.getExe python3Packages.uv; }) ]; @@ -61,11 +60,16 @@ python3Packages.buildPythonApplication rec { pytest-xdist setuptools ] - ++ [ cargo ] + ++ [ + cargo + versionCheckHook + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.ps ]; + versionCheckProgramArg = [ "--version" ]; + preCheck = '' export HOME=$(mktemp -d); ''; @@ -101,9 +105,6 @@ python3Packages.buildPythonApplication rec { "test_new_selected_python" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # https://github.com/NixOS/nixpkgs/issues/209358 - "test_scripts_no_environment" - # This test assumes it is running on macOS with a system shell on the PATH. # It is not possible to run it in a nix build using a /nix/store shell. # See https://github.com/pypa/hatch/pull/709 for the relevant code. @@ -126,8 +127,12 @@ python3Packages.buildPythonApplication rec { ]; passthru = { - tests.version = testers.testVersion { package = hatch; }; - updateScript = nix-update-script { }; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "hatch-v([0-9.]+)" + ]; + }; }; meta = { From 46f26360f65f00dabf5bf33d16a38f330ebd945b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 14 Oct 2024 08:44:47 +0200 Subject: [PATCH 098/108] python312Packages.testcontainers: 4.8.1 -> 4.8.2 Diff: https://github.com/testcontainers/testcontainers-python/compare/refs/tags/testcontainers-v4.8.1...testcontainers-v4.8.2 Changelog: https://github.com/testcontainers/testcontainers-python/releases/tag/testcontainers-v4.8.2 --- pkgs/development/python-modules/testcontainers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/testcontainers/default.nix b/pkgs/development/python-modules/testcontainers/default.nix index e1ef6e67796a..73cd3f3dcbfc 100644 --- a/pkgs/development/python-modules/testcontainers/default.nix +++ b/pkgs/development/python-modules/testcontainers/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "testcontainers"; - version = "4.8.1"; + version = "4.8.2"; pyproject = true; src = fetchFromGitHub { owner = "testcontainers"; repo = "testcontainers-python"; rev = "refs/tags/testcontainers-v${version}"; - hash = "sha256-UCT0AmpDWMiAeRuW4BadZl4cJFCQPDogHOSkTYi/tqM="; + hash = "sha256-cfvhTNUadx7zRmDPAv9Djsx+jWgBIAf9dMmwop/8oa0="; }; postPatch = '' From a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 14 Oct 2024 08:47:11 +0200 Subject: [PATCH 099/108] Revert "nixos/tests/networking: test nameservers via DHCP" This reverts commit bad5251e874bec27438cb8a613ec87e845ed437e. https://github.com/NixOS/nixpkgs/pull/348305#issuecomment-2410165312 Should've known that commit starting with `bad` will be no good. Fixes nixosTests.networking.networkd.dhcpSimple https://hydra.nixos.org/build/274843085/nixlog/8/tail --- nixos/tests/networking/networkd-and-scripted.nix | 4 ---- nixos/tests/networking/networkmanager.nix | 1 - nixos/tests/networking/router.nix | 1 - 3 files changed, 6 deletions(-) diff --git a/nixos/tests/networking/networkd-and-scripted.nix b/nixos/tests/networking/networkd-and-scripted.nix index 6b8ed50a2f19..777c00f74e22 100644 --- a/nixos/tests/networking/networkd-and-scripted.nix +++ b/nixos/tests/networking/networkd-and-scripted.nix @@ -132,10 +132,6 @@ let client.wait_until_succeeds("ip addr show dev enp2s0 | grep -q '192.168.2'") client.wait_until_succeeds("ip addr show dev enp2s0 | grep -q 'fd00:1234:5678:2:'") - with subtest("Wait until we have received the nameservers"): - client.wait_until_succeeds("grep -q 2001:db8::1 /etc/resolv.conf") - client.wait_until_succeeds("grep -q 192.168.2.1 /etc/resolv.conf") - with subtest("Test vlan 1"): client.wait_until_succeeds("ping -c 1 192.168.1.1") client.wait_until_succeeds("ping -c 1 fd00:1234:5678:1::1") diff --git a/nixos/tests/networking/networkmanager.nix b/nixos/tests/networking/networkmanager.nix index 70d28fe96380..bd989408df8a 100644 --- a/nixos/tests/networking/networkmanager.nix +++ b/nixos/tests/networking/networkmanager.nix @@ -121,7 +121,6 @@ let static.wait_for_unit("NetworkManager.service") dynamic.wait_until_succeeds("cat /etc/resolv.conf | grep -q '192.168.1.1'") - dynamic.wait_until_succeeds("cat /etc/resolv.conf | grep -q '2001:db8::1'") static.wait_until_succeeds("cat /etc/resolv.conf | grep -q '10.10.10.10'") static.wait_until_fails("cat /etc/resolv.conf | grep -q '192.168.1.1'") ''; diff --git a/nixos/tests/networking/router.nix b/nixos/tests/networking/router.nix index fab21c9e7862..e0ad7fa01591 100644 --- a/nixos/tests/networking/router.nix +++ b/nixos/tests/networking/router.nix @@ -72,7 +72,6 @@ AdvSendAdvert on; AdvManagedFlag on; AdvOtherConfigFlag on; - RDNSS 2001:db8::1 {}; prefix fd00:1234:5678:${toString n}::/64 { AdvAutonomous off; From 41bf9010a66a949550c469652f307da7c5d0b31f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 14 Oct 2024 09:04:12 +0200 Subject: [PATCH 100/108] python312Packages.tencentcloud-sdk-python: 3.0.1248 -> 3.0.1249 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1248...3.0.1249 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1249/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index da906793d206..5c2c1aff4b3b 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1248"; + version = "3.0.1249"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-w0iM9Pq3A7uJ3Q29Oo+YEhN2vPNJINjCwIoGaDwHK2A="; + hash = "sha256-I3/nEiCgZaAX32Kj2w+qWPwL5frxOdpLGF7dzBsptr8="; }; build-system = [ setuptools ]; From e6369781ae789ae64e55a9d93c8e393bca00ee05 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Mon, 14 Oct 2024 09:07:31 +0200 Subject: [PATCH 101/108] vscode-extensions.elixir-lsp.vscode-elixir-ls: 0.24.0 -> 0.24.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 17eb87f0c17e..d46dd4269c38 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1644,8 +1644,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.24.0"; - hash = "sha256-zNiKtOeZEO9zVpyF4AE/3FjiEy4jtCSCjB9T8e8PjRE="; + version = "0.24.1"; + hash = "sha256-C6p5IBJ6aKH2/AainIBwIWTPEALtHMkAd9+QnFCzA7c="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; From cc68b91e1173b90641c8b12eeda6fa515993ce2c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Oct 2024 10:12:49 +0000 Subject: [PATCH 102/108] python312Packages.ipytablewidgets: 0.3.1 -> 0.3.2 --- .../python-modules/ipytablewidgets/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/ipytablewidgets/default.nix b/pkgs/development/python-modules/ipytablewidgets/default.nix index 0f54bb310567..e536861e1061 100644 --- a/pkgs/development/python-modules/ipytablewidgets/default.nix +++ b/pkgs/development/python-modules/ipytablewidgets/default.nix @@ -12,20 +12,18 @@ pandas, setuptools, traitlets, - traittypes, - wheel, }: buildPythonPackage rec { pname = "ipytablewidgets"; - version = "0.3.1"; - format = "pyproject"; + version = "0.3.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-14vIih+r/PHLxhgG29YtwuosSBLpewD2CluWpH2+pLc="; + hash = "sha256-CGkb//mLUmkyv+hmVJX5+04JGCfw+TtfBxMTXW0bhsw="; }; # Opened https://github.com/progressivis/ipytablewidgets/issues/3 to ask if @@ -37,20 +35,18 @@ buildPythonPackage rec { --replace 'jupyterlab>=3.0.0,<3.7' 'jupyterlab>=3.0.0' ''; - nativeBuildInputs = [ + build-system = [ jupyter-packaging jupyterlab setuptools - wheel ]; - propagatedBuildInputs = [ + dependencies = [ ipywidgets lz4 numpy pandas traitlets - traittypes ]; nativeCheckInputs = [ pytestCheckHook ]; From ad8d476b53bd39c93b33d6542eade24230114ac8 Mon Sep 17 00:00:00 2001 From: nvimtor Date: Sat, 7 Sep 2024 21:31:37 +0100 Subject: [PATCH 103/108] vimPlugins.leetcode-nvim: init at 2024-06-27 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 +++++++++++- pkgs/applications/editors/vim/plugins/overrides.nix | 11 +++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index d183730963b5..485283b46b00 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -18636,5 +18636,15 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; - + leetcode-nvim = buildVimPlugin { + pname = "leetcode.nvim"; + version = "2024-06-27"; + src = fetchFromGitHub { + owner = "kawre"; + repo = "leetcode.nvim"; + rev = "02fb2c855658ad6b60e43671f6b040c812181a1d"; + sha256 = "sha256-YoFRd9Uf+Yv4YM6/l7MVLMjfRqhroSS3RCmZvNowIAo="; + }; + meta.homepage = "https://github.com/kawre/leetcode.nvim/"; + }; } diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 3addfab29459..1d5a0e7cd365 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -2651,6 +2651,17 @@ in nvimRequireCheck = "yazi"; }; + leetcode-nvim = super.leetcode-nvim.overrideAttrs { + dependencies = with self; [ + nui-nvim + plenary-nvim + telescope-nvim + ]; + + doInstallCheck = true; + nvimRequireCheck = "leetcode"; + }; + YouCompleteMe = super.YouCompleteMe.overrideAttrs { buildPhase = '' substituteInPlace plugin/youcompleteme.vim \ diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index be41e83a655a..c4d547e962e4 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -475,6 +475,7 @@ https://github.com/Julian/lean.nvim/,, https://github.com/leanprover/lean.vim/,, https://github.com/ggandor/leap-ast.nvim/,HEAD, https://github.com/ggandor/leap.nvim/,HEAD, +https://github.com/kawre/leetcode.nvim/,HEAD, https://github.com/mrjones2014/legendary.nvim/,HEAD, https://github.com/camspiers/lens.vim/,, https://github.com/thirtythreeforty/lessspace.vim/,, From e5abe4d2cc8f506ac67dd52cdb178ce358a99836 Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 14 Oct 2024 15:49:31 +0800 Subject: [PATCH 104/108] alpaca: 2.6.0 -> 2.6.5 Diff: https://github.com/Jeffser/Alpaca/compare/2.6.0...2.6.5 Changelog: https://github.com/Jeffser/Alpaca/releases/tag/2.6.5 --- pkgs/by-name/al/alpaca/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix index 88a3dc8fc502..eb025a0a969d 100644 --- a/pkgs/by-name/al/alpaca/package.nix +++ b/pkgs/by-name/al/alpaca/package.nix @@ -18,14 +18,14 @@ python3Packages.buildPythonApplication rec { pname = "alpaca"; - version = "2.6.0"; + version = "2.6.5"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "Jeffser"; repo = "Alpaca"; rev = "refs/tags/${version}"; - hash = "sha256-XXxfbchQ1l6L8KflqjlGIiyRbG/dI5ok0ExlROavXYg="; + hash = "sha256-tXUM2XxYXUTXsycfq0hmkzc4quHKh7+0qit1YuKdCeQ="; }; nativeBuildInputs = [ From df6592daffd95c1e97ff94f4d19ebc1ca086d648 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 14 Oct 2024 11:54:25 +0300 Subject: [PATCH 105/108] texlab: fix aarch64-linux build --- pkgs/development/tools/misc/texlab/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 301abb6df1af..8b0026fdf441 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -26,6 +26,11 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-A/stdJ1baV0hdDXTdLd9gi8+JO7qPgQbNiYjHkp1GPQ="; + # https://github.com/latex-lsp/texlab/pull/1237 + preBuild = '' + rm .cargo/config.toml + ''; + outputs = [ "out" ] ++ lib.optional (!isCross) "man"; nativeBuildInputs = [ installShellFiles ] From 1d6675e530f983cc95f62056e70008714107d4b9 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 11 Oct 2024 11:41:49 +0200 Subject: [PATCH 106/108] llvmPackages_13: build from filtered monorepoSrc This change implements a leftover task from #307211, namely passing monorepoSrc to the different llvmPackages_13 package expressions. Before this change, all packages llvmPackages_13 would be built from a subdirectory of the full LLVM monorepo tree. After this change only the relevant directories are made available at build time. This - reduces the size of the source that needs to be made available to the builder. - prevents LLVM from sidestepping our instructions and including extra sources from other directories it shouldn't. Since LLVM 12 and 13 don't have the `cmake` directory at the top level, the runCommand expressions filtering the source need to be adjusted, but this causes no rebuild for any other LLVM version (ofborg should confirm this). The only problem encountered was in lld: - We need to make the patch to the inclusion of libunwind headers unconditional now. lld needs this on non-darwin as well. In the full monorepo, LLVM_MAIN_SRC_DIR would be set correctly, so the patch wasn't necessary. - The substitute mechanism for LLVM 12 and 13 can't be unified yet since LLVM 12 still uses a non monorepo build, so we come up with a different LLVM_MAIN_SRC_DIR. Change was tested by building the following expression on x86_64-linux. with import ./. {}; builtins.removeAttrs llvmPackages_13 [ "lldb" "lldbPlugins" ]' lld was also tested on aarch64-darwin. --- .../compilers/llvm/common/bolt/default.nix | 25 ++++++++++++------- .../compilers/llvm/common/clang/default.nix | 6 +++-- .../llvm/common/compiler-rt/default.nix | 6 +++-- .../compilers/llvm/common/default.nix | 8 +----- .../compilers/llvm/common/libclc.nix | 16 ++++++++---- .../llvm/common/libunwind/default.nix | 2 ++ .../compilers/llvm/common/lld/default.nix | 10 +++++--- .../compilers/llvm/common/lldb.nix | 2 ++ .../compilers/llvm/common/llvm/default.nix | 4 +++ .../compilers/llvm/common/mlir/default.nix | 7 ++++-- .../compilers/llvm/common/openmp/default.nix | 6 +++-- 11 files changed, 59 insertions(+), 33 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/bolt/default.nix b/pkgs/development/compilers/llvm/common/bolt/default.nix index 9d6385ae74b3..d62841b48d0a 100644 --- a/pkgs/development/compilers/llvm/common/bolt/default.nix +++ b/pkgs/development/compilers/llvm/common/bolt/default.nix @@ -3,6 +3,7 @@ stdenv, llvm_meta, monorepoSrc, + release_version, runCommand, cmake, libxml2, @@ -20,16 +21,22 @@ stdenv.mkDerivation (finalAttrs: { inherit version patches; # Blank llvm dir just so relative path works - src = runCommand "bolt-src-${finalAttrs.version}" { } '' - mkdir $out - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/${finalAttrs.pname} "$out" - cp -r ${monorepoSrc}/third-party "$out" + src = runCommand "bolt-src-${finalAttrs.version}" { } ( + '' + mkdir $out + '' + + lib.optionalString (lib.versionAtLeast release_version "14") '' + cp -r ${monorepoSrc}/cmake "$out" + '' + + '' + cp -r ${monorepoSrc}/${finalAttrs.pname} "$out" + cp -r ${monorepoSrc}/third-party "$out" - # tablegen stuff, probably not the best way but it works... - cp -r ${monorepoSrc}/llvm/ "$out" - chmod -R +w $out/llvm - ''; + # tablegen stuff, probably not the best way but it works... + cp -r ${monorepoSrc}/llvm/ "$out" + chmod -R +w $out/llvm + '' + ); sourceRoot = "${finalAttrs.src.name}/bolt"; diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix index 2b5aca109348..5c9662c24d58 100644 --- a/pkgs/development/compilers/llvm/common/clang/default.nix +++ b/pkgs/development/compilers/llvm/common/clang/default.nix @@ -24,12 +24,14 @@ let pname = "clang"; src' = if monorepoSrc != null then - runCommand "${pname}-src-${version}" {} '' + runCommand "${pname}-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${pname} "$out" cp -r ${monorepoSrc}/clang-tools-extra "$out" - '' else src; + '') else src; self = stdenv.mkDerivation (finalAttrs: rec { inherit pname version patches; diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix index a6d727739d27..cce348b3ef50 100644 --- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix @@ -47,11 +47,13 @@ let pname = baseName + lib.optionalString (haveLibc) "-libc"; src' = if monorepoSrc != null then - runCommand "${baseName}-src-${version}" {} '' + runCommand "${baseName}-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${baseName} "$out" - '' else src; + '') else src; preConfigure = lib.optionalString (!haveLibc) '' cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding") diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 55d26de9fc09..2f47f1a583c5 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -346,13 +346,7 @@ let tools = lib.makeExtensible ( tools: let - callPackage = newScope ( - tools - // args - // metadata - # Previously monorepoSrc was erroneously not being passed through. - // lib.optionalAttrs (lib.versionOlder metadata.release_version "14") { monorepoSrc = null; } # Preserve a bug during #307211, TODO: remove; causes llvm 13 rebuild. - ); + callPackage = newScope (tools // args // metadata); clangVersion = if (lib.versionOlder metadata.release_version "16") then metadata.release_version diff --git a/pkgs/development/compilers/llvm/common/libclc.nix b/pkgs/development/compilers/llvm/common/libclc.nix index 299b27417b6a..c24fc6e3b4c0 100644 --- a/pkgs/development/compilers/llvm/common/libclc.nix +++ b/pkgs/development/compilers/llvm/common/libclc.nix @@ -22,11 +22,17 @@ stdenv.mkDerivation rec { pname = "libclc"; inherit version; - src = runCommand "${pname}-src-${version}" { } '' - mkdir -p "$out" - cp -r ${monorepoSrc}/cmake "$out" - cp -r ${monorepoSrc}/${pname} "$out" - ''; + src = runCommand "${pname}-src-${version}" { } ( + '' + mkdir -p "$out" + '' + + lib.optionalString (lib.versionAtLeast release_version "14") '' + cp -r ${monorepoSrc}/cmake "$out" + '' + + '' + cp -r ${monorepoSrc}/${pname} "$out" + '' + ); sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/compilers/llvm/common/libunwind/default.nix b/pkgs/development/compilers/llvm/common/libunwind/default.nix index 77854ddfcc5d..63b9737092b8 100644 --- a/pkgs/development/compilers/llvm/common/libunwind/default.nix +++ b/pkgs/development/compilers/llvm/common/libunwind/default.nix @@ -19,7 +19,9 @@ let src' = if monorepoSrc != null then runCommand "${pname}-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${pname} "$out" mkdir -p "$out/libcxx" cp -r ${monorepoSrc}/libcxx/cmake "$out/libcxx" diff --git a/pkgs/development/compilers/llvm/common/lld/default.nix b/pkgs/development/compilers/llvm/common/lld/default.nix index d5c0f7cb3a09..32cf5cb46460 100644 --- a/pkgs/development/compilers/llvm/common/lld/default.nix +++ b/pkgs/development/compilers/llvm/common/lld/default.nix @@ -19,21 +19,23 @@ let pname = "lld"; src' = if monorepoSrc != null then - runCommand "lld-src-${version}" {} '' + runCommand "lld-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${pname} "$out" mkdir -p "$out/libunwind" cp -r ${monorepoSrc}/libunwind/include "$out/libunwind" mkdir -p "$out/llvm" - '' else src; + '') else src; postPatch = lib.optionalString (lib.versions.major release_version == "12") '' substituteInPlace MachO/CMakeLists.txt --replace \ '(''${LLVM_MAIN_SRC_DIR}/' '(' mkdir -p libunwind/include tar -xf "${libunwind.src}" --wildcards -C libunwind/include --strip-components=2 "libunwind-*/include/" - '' + lib.optionalString (lib.versions.major release_version == "13" && stdenv.hostPlatform.isDarwin) '' + '' + lib.optionalString (lib.versions.major release_version == "13") '' substituteInPlace MachO/CMakeLists.txt --replace \ '(''${LLVM_MAIN_SRC_DIR}/' '(../' ''; @@ -75,4 +77,4 @@ stdenv.mkDerivation (rec { of several different linkers. ''; }; -} // (if (postPatch == "" && lib.versions.major release_version != "13") then {} else { inherit postPatch; })) +} // (lib.optionalAttrs (postPatch != "") { inherit postPatch; })) diff --git a/pkgs/development/compilers/llvm/common/lldb.nix b/pkgs/development/compilers/llvm/common/lldb.nix index 4f679f4dcff1..38bc91977c36 100644 --- a/pkgs/development/compilers/llvm/common/lldb.nix +++ b/pkgs/development/compilers/llvm/common/lldb.nix @@ -32,7 +32,9 @@ let if monorepoSrc != null then runCommand "lldb-src-${version}" { } ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/lldb "$out" '' + lib.optionalString (lib.versionAtLeast release_version "19" && enableManpages) '' mkdir -p "$out/llvm" diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index 281a21ca1524..fc139c703774 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -77,11 +77,15 @@ let pname = "llvm"; + # TODO: simplify versionAtLeast condition for cmake and third-party via rebuild src' = if monorepoSrc != null then runCommand "${pname}-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${pname} "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/third-party "$out" '' + lib.optionalString enablePolly '' chmod u+w "$out/${pname}/tools" diff --git a/pkgs/development/compilers/llvm/common/mlir/default.nix b/pkgs/development/compilers/llvm/common/mlir/default.nix index e4dd12d69e58..9c3c71c3b705 100644 --- a/pkgs/development/compilers/llvm/common/mlir/default.nix +++ b/pkgs/development/compilers/llvm/common/mlir/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , llvm_meta +, release_version , buildLlvmTools , monorepoSrc , runCommand @@ -18,14 +19,16 @@ stdenv.mkDerivation rec { inherit version doCheck; # Blank llvm dir just so relative path works - src = runCommand "${pname}-src-${version}" { } '' + src = runCommand "${pname}-src-${version}" { } ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/mlir "$out" cp -r ${monorepoSrc}/third-party "$out/third-party" mkdir -p "$out/llvm" - ''; + ''); sourceRoot = "${src.name}/mlir"; diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix index 57c6de07c784..1ad5948edb86 100644 --- a/pkgs/development/compilers/llvm/common/openmp/default.nix +++ b/pkgs/development/compilers/llvm/common/openmp/default.nix @@ -21,11 +21,13 @@ let pname = "openmp"; src' = if monorepoSrc != null then - runCommand "${pname}-src-${version}" {} '' + runCommand "${pname}-src-${version}" {} ('' mkdir -p "$out" + '' + lib.optionalString (lib.versionAtLeast release_version "14") '' cp -r ${monorepoSrc}/cmake "$out" + '' + '' cp -r ${monorepoSrc}/${pname} "$out" - '' else src; + '') else src; in stdenv.mkDerivation (rec { inherit pname version patches; From 0ebf6d5c0212366e85a5a6d303ad62980517004e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 13 Oct 2024 17:54:11 -0700 Subject: [PATCH 107/108] radicale: 3.2.3 -> 3.3.0 Diff: https://github.com/Kozea/Radicale/compare/refs/tags/v3.2.3...v3.3.0 Changelog: https://github.com/Kozea/Radicale/blob/refs/tags/v3.3.0/CHANGELOG.md --- pkgs/by-name/ra/radicale/package.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ra/radicale/package.nix b/pkgs/by-name/ra/radicale/package.nix index 1946ffab2fac..9cdcd7ab4104 100644 --- a/pkgs/by-name/ra/radicale/package.nix +++ b/pkgs/by-name/ra/radicale/package.nix @@ -6,20 +6,16 @@ python3.pkgs.buildPythonApplication rec { pname = "radicale"; - version = "3.2.3"; + version = "3.3.0"; pyproject = true; src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; rev = "refs/tags/v${version}"; - hash = "sha256-1IlnXVetQQuKBt6+QVKNeMM6qBQAiUhqc+4x3xOnSdE="; + hash = "sha256-S9/bPgItbr6rRr4WX+hmyU1RvKn5gz9FdZjYlr0hnd0="; }; - postPatch = '' - sed -i '/addopts/d' setup.cfg - ''; - build-system = with python3.pkgs; [ setuptools ]; @@ -36,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { __darwinAllowLocalNetworking = true; nativeCheckInputs = with python3.pkgs; [ - pytest7CheckHook + pytestCheckHook waitress ]; From b59896963540fbaceaf46231df254d9da63cd0be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 12 Oct 2024 23:31:18 +0200 Subject: [PATCH 108/108] local-ai: 2.21.1 -> 2.22.0 --- pkgs/by-name/lo/local-ai/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix index c423a0d8c74f..766720dfd65b 100644 --- a/pkgs/by-name/lo/local-ai/package.nix +++ b/pkgs/by-name/lo/local-ai/package.nix @@ -147,8 +147,8 @@ let src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; - rev = "70392f1f81470607ba3afef04aa56c9f65587664"; - hash = "sha256-PgdH3Q4lM45a7aLeN/19i0Ld4NuTfzh/caYOSdooFao="; + rev = "96776405a17034dcfd53d3ddf5d142d34bdbb657"; + hash = "sha256-V5Z+8cpllhDR0s4InoXyEU59a/qo2b5Xj8oeZd0rtGk="; fetchSubmodules = true; }; postPatch = @@ -299,8 +299,8 @@ let src = fetchFromGitHub { owner = "ggerganov"; repo = "whisper.cpp"; - rev = "0d2e2aed80109e8696791083bde3b58e190b7812"; - hash = "sha256-HE9FLwLGVCggEF7VjWtdNhNnhe7c1RQp30spEIkK4TI="; + rev = "fdbfb460ed546452a5d53611bba66d10d842e719"; + hash = "sha256-ZLSVPQUw1sp7sETk2w38qKq8ut7XNGuof2TUvFzjdPk="; }; nativeBuildInputs = [ @@ -431,12 +431,12 @@ let stdenv; pname = "local-ai"; - version = "2.21.1"; + version = "2.22.0"; src = fetchFromGitHub { owner = "go-skynet"; repo = "LocalAI"; rev = "v${version}"; - hash = "sha256-UlXBg/FKv/GNz2PCEVvzhILNdyQvTfkw157sNpunf2I="; + hash = "sha256-EwBgw0WXnK3E3ZyA1+Xk/o7Te7OCJWi7njefA4PDUJ0="; }; prepare-sources =