From 53d1bb94a5da90eb3dc200a1c95b6fd320db09f0 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Fri, 9 Feb 2024 12:53:59 +0100 Subject: [PATCH 01/54] pgadmin4: 8.2 -> 8.3 Signed-off-by: Florian Brandes --- pkgs/tools/admin/pgadmin/default.nix | 6 +-- pkgs/tools/admin/pgadmin/yarn.lock | 59 +++++++++++++++++++++++++--- 2 files changed, 56 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 586d553f4109..dcd250b9e837 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -14,14 +14,14 @@ let pname = "pgadmin"; - version = "8.2"; - yarnHash = "sha256-uMSgpkYoLD32VYDAkjywC9bZjm7UKA0hhwVNc/toEbA="; + version = "8.3"; + yarnHash = "sha256-nhHss4YOFu2cGkIhA909lIdnf3H3pD9BQx4PvP9+9c0="; src = fetchFromGitHub { owner = "pgadmin-org"; repo = "pgadmin4"; rev = "REL-${lib.versions.major version}_${lib.versions.minor version}"; - hash = "sha256-RfpZXy265kwpMsWUBDVfbL/0eX0By79I4VNkG8zwVOs="; + hash = "sha256-2L/JLkuyjx1oD9akQULmzW0FlSq8/MQlZ1HmlO81jj0="; }; # keep the scope, as it is used throughout the derivation and tests diff --git a/pkgs/tools/admin/pgadmin/yarn.lock b/pkgs/tools/admin/pgadmin/yarn.lock index cf3e188e8674..c6573efabf78 100644 --- a/pkgs/tools/admin/pgadmin/yarn.lock +++ b/pkgs/tools/admin/pgadmin/yarn.lock @@ -4593,7 +4593,7 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" -"commander@^2.20.0", "commander@^2.8.1": +"commander@^2.19.0", "commander@^2.20.0", "commander@^2.8.1": version "2.20.3" resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -5369,6 +5369,11 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" +discontinuous-range@1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a" + integrity sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ== + dnd-core@14.0.1: version "14.0.1" resolved "https://registry.npmjs.org/dnd-core/-/dnd-core-14.0.1.tgz#76d000e41c494983210fb20a48b835f81a203c2e" @@ -6490,6 +6495,11 @@ get-proxy@^2.0.0: dependencies: npm-conf "^1.1.0" +get-stdin@=8.0.0: + version "8.0.0" + resolved "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53" + integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg== + "get-stream@3.0.0", "get-stream@^3.0.0": version "3.0.0" resolved "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" @@ -8903,6 +8913,11 @@ moment@^2.29.4: resolved "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== +moo@^0.5.0: + version "0.5.2" + resolved "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz#f9fe82473bc7c184b0d32e2215d3f6e67278733c" + integrity sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q== + mousetrap@^1.6.3: version "1.6.5" resolved "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.5.tgz#8a766d8c272b08393d5f56074e0b5ec183485bf9" @@ -8958,6 +8973,16 @@ natural-compare@^1.4.0: resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== +nearley@^2.20.1: + version "2.20.1" + resolved "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz#246cd33eff0d012faf197ff6774d7ac78acdd474" + integrity sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ== + dependencies: + commander "^2.19.0" + moo "^0.5.0" + railroad-diagrams "^1.0.0" + randexp "0.4.6" + neatequal@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/neatequal/-/neatequal-1.0.0.tgz#2ee1211bc9fa6e4c55715fd210bb05602eb1ae3b" @@ -10210,6 +10235,19 @@ raf@^3.4.1: dependencies: performance-now "^2.1.0" +railroad-diagrams@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e" + integrity sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A== + +randexp@0.4.6: + version "0.4.6" + resolved "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3" + integrity sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ== + dependencies: + discontinuous-range "1.0.0" + ret "~0.1.10" + "randombytes@^2.0.0", "randombytes@^2.0.1", "randombytes@^2.0.5", "randombytes@^2.1.0": version "2.1.0" resolved "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" @@ -10842,6 +10880,11 @@ responselike@1.0.2: dependencies: lowercase-keys "^1.0.0" +ret@~0.1.10: + version "0.1.15" + resolved "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" + integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== + retry@^0.12.0: version "0.12.0" resolved "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" @@ -11331,6 +11374,15 @@ sprintf-js@~1.0.2: resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== +sql-formatter@^15.1.2: + version "15.1.2" + resolved "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.1.2.tgz#86df2592eedf6d422244e10e00a74380c22791b7" + integrity sha512-zBrLBclCNurCsQaO6yMvkXzHvv7eJPjiF8LIEQ5HdBV/x6UuWIZwqss3mlZ/6HLj+VYhFKeHpQnyLuZWG2agKQ== + dependencies: + argparse "^2.0.1" + get-stdin "=8.0.0" + nearley "^2.20.1" + ssri@^10.0.0: version "10.0.4" resolved "https://registry.npmjs.org/ssri/-/ssri-10.0.4.tgz#5a20af378be586df139ddb2dfb3bf992cf0daba6" @@ -12716,8 +12768,3 @@ zustand@^4.4.1: resolved "https://github.com/pgadmin-org/react-data-grid.git#200d2f5e02de694e3e9ffbe177c279bc40240fb8" dependencies: "clsx" "^1.1.1" -"react-data-grid@https://github.com/pgadmin-org/react-data-grid.git#200d2f5e02de694e3e9ffbe177c279bc40240fb8": - version "7.0.0-beta.14" - resolved "https://github.com/pgadmin-org/react-data-grid.git#200d2f5e02de694e3e9ffbe177c279bc40240fb8" - dependencies: - "clsx" "^1.1.1" From 4e8a98c5352d641146011890de66a6a90ef1329d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 1 Feb 2024 15:20:06 +0100 Subject: [PATCH 02/54] python311Packages.celery: disable failing test This seems to only fail on high cores counts, eg 96 cores --- pkgs/development/python-modules/celery/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index fa7ebb248adb..587c17b3eca9 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -79,6 +79,9 @@ buildPythonPackage rec { disabledTests = [ "msgpack" "test_check_privileges_no_fchown" + # seems to only fail on higher core counts + # AssertionError: assert 3 == 0 + "test_setup_security_disabled_serializers" # fails with pytest-xdist "test_itercapture_limit" "test_stamping_headers_in_options" From 1f4d82f1ac8c33ce24880a8cfe96a867f9d960cc Mon Sep 17 00:00:00 2001 From: emilylange Date: Fri, 1 Mar 2024 19:13:51 +0100 Subject: [PATCH 03/54] laurel: 0.5.6 -> 0.6.0 https://github.com/threathunters-io/laurel/releases/tag/v0.6.0 diff: https://github.com/threathunters-io/laurel/compare/refs/tags/v0.5.6...v0.6.0 --- pkgs/servers/monitoring/laurel/default.nix | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/laurel/default.nix b/pkgs/servers/monitoring/laurel/default.nix index 8b26a04f2a05..a667d1d442b1 100644 --- a/pkgs/servers/monitoring/laurel/default.nix +++ b/pkgs/servers/monitoring/laurel/default.nix @@ -1,21 +1,33 @@ { acl , fetchFromGitHub +, fetchpatch , lib , rustPlatform }: rustPlatform.buildRustPackage rec { pname = "laurel"; - version = "0.5.6"; + version = "0.6.0"; src = fetchFromGitHub { owner = "threathunters-io"; - repo = pname; + repo = "laurel"; rev = "refs/tags/v${version}"; - hash = "sha256-IGmpNSHGlQGJn4cvcXXWbIOWqsXizzp1azfT41B4rm4="; + hash = "sha256-lWVrp0ytomrQBSDuQCMFJpSuAuwjSYPwoE4yh/WO2ls="; }; - cargoHash = "sha256-jm1AWybDnpc1E4SWieQcsVwn8mxkJ5damMsXqg54LI8="; + cargoHash = "sha256-GY7vpst+Epsy/x/ths6pwtGQgM6Bx0KI+NsCMFCBujE="; + + cargoPatches = [ + # Upstream forgot to bump the Cargo.lock before tagging the release. + # This patch is the first commit immediately after the tag fixing this mistake. + # Needs to be removed next release. + (fetchpatch { + name = "Cargo-lock-version-bump.patch"; + url = "https://github.com/threathunters-io/laurel/commit/f38393d1098e8f75394f83ad3da5c1160fb96652.patch"; + hash = "sha256-x+7p21X38KYqLclFtGnLO5nOHz819+XTaSPMvDbSo/I="; + }) + ]; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = [ acl ]; From e09e1cc27305d80ca3fe76099514f58d2a4c6544 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Mar 2024 01:39:57 +0000 Subject: [PATCH 04/54] theme-obsidian2: 2.23 -> 2.24 --- pkgs/data/themes/obsidian2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix index 86b06f823535..1d7756e23b05 100644 --- a/pkgs/data/themes/obsidian2/default.nix +++ b/pkgs/data/themes/obsidian2/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "theme-obsidian2"; - version = "2.23"; + version = "2.24"; src = fetchurl { url = "https://github.com/madmaxms/theme-obsidian-2/releases/download/v${version}/obsidian-2-theme.tar.xz"; - sha256 = "sha256-yJoMS5XrHlMss+rdJ+xLJx0F9Hs1Cc+MFk+xyhRXaf0="; + sha256 = "sha256-P+62cdYiCk8419S+u1w6EmzJL0rgHAh7G5eTuBOrAGY="; }; sourceRoot = "."; From 0aac2d775712280edb56d66a23c6073f48051792 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 3 Mar 2024 20:39:35 -0500 Subject: [PATCH 05/54] kodi: 20.3 -> 20.5 --- pkgs/applications/video/kodi/unwrapped.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index ec84aa9ff6b3..894e54b28f51 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -39,15 +39,15 @@ assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is assert gbmSupport || waylandSupport || x11Support; let - kodiReleaseDate = "20240109"; - kodiVersion = "20.3"; + kodiReleaseDate = "20240302"; + kodiVersion = "20.5"; rel = "Nexus"; kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - hash = "sha256-OMm8WhTQiEZvu8jHOUp2zT4Xd4NU3svMobW2k8AAtNI="; + hash = "sha256-R/tzk3ZarJ4BTR312p2lTLezeCEsqdQH54ROsNIoJZA="; }; # see https://github.com/xbmc/xbmc/blob/${kodiVersion}-${rel}/tools/depends/target/ to get suggested versions for all dependencies From 7d46e39bdf3e8a9193b062225649b047a513c48f Mon Sep 17 00:00:00 2001 From: Hugh O'Brien Date: Sun, 3 Mar 2024 23:35:05 -0500 Subject: [PATCH 06/54] dosbox-x: 2023.10.06 -> 2024.03.01 --- .../emulators/dosbox-x/default.nix | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/emulators/dosbox-x/default.nix b/pkgs/applications/emulators/dosbox-x/default.nix index f26a12884222..c499c69e5442 100644 --- a/pkgs/applications/emulators/dosbox-x/default.nix +++ b/pkgs/applications/emulators/dosbox-x/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , alsa-lib , AudioUnit , autoreconfHook @@ -28,30 +27,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosbox-x"; - version = "2023.10.06"; + version = "2024.03.01"; src = fetchFromGitHub { owner = "joncampbell123"; repo = "dosbox-x"; rev = "dosbox-x-v${finalAttrs.version}"; - hash = "sha256-YNYtYqcpTOx4xS/LXI53h3S+na8JVpn4w8Dhf4fWNBQ="; + hash = "sha256-EcAp7KyqXdBACEbPgkM1INoKeGVo7hMDUx97y2RcX+k="; }; - patches = [ - # 2 patches which fix stack smashing when launching Windows 3.0 - # Remove when version > 2023.10.06 - (fetchpatch { - name = "0001-dosbox-x-Attempt-to-fix-graphical-palette-issues-added-by-TTF-fix.patch"; - url = "https://github.com/joncampbell123/dosbox-x/commit/40bf135f70376b5c3944fe2e972bdb7143439bcc.patch"; - hash = "sha256-9whtqBkivYVYaPObyTODtwcfjaoK+rLqhCNZ7zVoiGI="; - }) - (fetchpatch { - name = "0002-dosbox-x-Fix-Sid-Meiers-Civ-crash.patch"; - url = "https://github.com/joncampbell123/dosbox-x/compare/cdcfb554999572e758b81edf85a007d398626b78..ac91760d9353c301e1da382f93e596238cf6d336.patch"; - hash = "sha256-G7HbUhYEi6JJklN1z3JiOTnWLuWb27bMDyB/iGwywuY="; - }) - ]; - strictDeps = true; nativeBuildInputs = [ From b7736a1666f33285ced1c6c8a8ef0038fd84633a Mon Sep 17 00:00:00 2001 From: Kait Lam Date: Mon, 4 Mar 2024 15:26:10 +1000 Subject: [PATCH 07/54] antlr: symlink jar instead of copying this also allows for using the jarLocation as a standalone file without pulling in a Java runtime from the wrapper scripts. --- pkgs/development/tools/parsing/antlr/4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/antlr/4.nix b/pkgs/development/tools/parsing/antlr/4.nix index a4b2034852f2..79db5301add9 100644 --- a/pkgs/development/tools/parsing/antlr/4.nix +++ b/pkgs/development/tools/parsing/antlr/4.nix @@ -38,7 +38,7 @@ let installPhase = '' mkdir -p "$out"/{share/java,bin} - cp "$src" "$out/share/java/antlr-${version}-complete.jar" + ln -s "$src" "$out/share/java/antlr-${version}-complete.jar" echo "#! ${stdenv.shell}" >> "$out/bin/antlr" echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' -Xmx500M org.antlr.v4.Tool \"\$@\"" >> "$out/bin/antlr" @@ -58,7 +58,7 @@ let passthru = { inherit runtime; - jarLocation = "${antlr}/share/java/antlr-${version}-complete.jar"; + jarLocation = antlr.src; }; meta = with lib; { From 8e496eee23c9c33d618b675d01df9ae9ced62f64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Mar 2024 15:02:13 +0000 Subject: [PATCH 08/54] super-productivity: 8.0.0 -> 8.0.1 --- pkgs/applications/office/super-productivity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix index a8aa978081e7..eb97565cb760 100644 --- a/pkgs/applications/office/super-productivity/default.nix +++ b/pkgs/applications/office/super-productivity/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "super-productivity"; - version = "8.0.0"; + version = "8.0.1"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-VYyJ3tsCyabwNSxLXQsc3GBAmDmdgl50T8ZP2qkXTeM="; + sha256 = "sha256-BW/4jP4lh3leAcdy3JHET/PUybN+0Cy9wxMSi57dAcw="; name = "${pname}-${version}.AppImage"; }; From 2db7219679cc8d81c0299b5bdeb068c9eb6137dc Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 4 Mar 2024 11:25:42 -0500 Subject: [PATCH 09/54] uhk-agent: 4.0.0 -> 4.0.1 Diff: https://github.com/UltimateHackingKeyboard/agent/compare/v4.0.0...v4.0.1 --- pkgs/os-specific/linux/uhk-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/uhk-agent/default.nix b/pkgs/os-specific/linux/uhk-agent/default.nix index 28afb1ef4d20..093b92276f87 100644 --- a/pkgs/os-specific/linux/uhk-agent/default.nix +++ b/pkgs/os-specific/linux/uhk-agent/default.nix @@ -12,12 +12,12 @@ let pname = "uhk-agent"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-Vf01OANE5mow7ogmzPg0cJgw0fA02DF5SqZ49n9xa5U="; + sha256 = "sha256-4N+BjllIMK/dUHL7yEeigOVIO2JyJdqZWGYOoZBMoGg="; }; appimageContents = appimageTools.extract { From 04631cc60b75502110aa15107196c8a611dacdc1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Mar 2024 16:55:27 +0000 Subject: [PATCH 10/54] griffe: 0.41.0 -> 0.41.2 --- pkgs/development/python-modules/griffe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 8f2884a5b6c6..8802b5b4cae4 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.41.0"; + version = "0.41.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "griffe"; rev = "refs/tags/${version}"; - hash = "sha256-or0kXc8YJl7+95gM54MaviDdErN0vqBnCtAavZM938k="; + hash = "sha256-SelsCh72tcvOfiH6tGxXK0X9mNuB2mFBBqJ+Ji5uCSs="; }; nativeBuildInputs = [ From 203f41e82eb5c1dff13aabdeca0b0a5e83fac49a Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 4 Mar 2024 11:28:38 -0800 Subject: [PATCH 11/54] signalbackup-tools: 20240227-1 -> 20240304 Diff: https://github.com/bepaald/signalbackup-tools/compare/20240227-1...20240304 --- .../instant-messengers/signalbackup-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 239b5ed2a705..307d6ab5b6bb 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20240227-1"; + version = "20240304"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-RW7FbFq201FrRyO+1E0vZ5nenp002E780pImdyUUMJY="; + hash = "sha256-FvQaBGWPcewrvLaCzWgsn+cAe0Nye4d1s6IZu9JbcO0="; }; postPatch = '' From 4e8d730e2949afd7e3828b4361b54767882599fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Mar 2024 20:07:54 +0000 Subject: [PATCH 12/54] python311Packages.peaqevcore: 19.7.1 -> 19.7.2 --- pkgs/development/python-modules/peaqevcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index f0213c041ec2..720cb3f5a650 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "19.7.1"; + version = "19.7.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BVUnSKmLOF6DKirAI2lv8/tpcSGus2XZTPn3WSJjwgg="; + hash = "sha256-k9MiYJZN4TLY+HP1NfJER3upnQ//JBgrsERJ2JF+Xvw="; }; postPatch = '' From 207d62bc235378fdb9c0a50a66c0b2b63e230df1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Mar 2024 21:19:42 +0000 Subject: [PATCH 13/54] python312Packages.easydict: 1.11 -> 1.13 --- pkgs/development/python-modules/easydict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/easydict/default.nix b/pkgs/development/python-modules/easydict/default.nix index 2a06fe02d133..14aae92ef5c4 100644 --- a/pkgs/development/python-modules/easydict/default.nix +++ b/pkgs/development/python-modules/easydict/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "easydict"; - version = "1.11"; + version = "1.13"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-3LHS7SjrMAyORs03E0A3Orxi98FNbep0/fxvEGkGHHg="; + hash = "sha256-sRNd7bxByAEOK8H3fsl0TH+qQrzhoch0FnkUSdbId4A="; }; doCheck = false; # No tests in archive From 03d521141a171b85b545a8cc046d73d6b288d823 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Mar 2024 22:54:53 +0000 Subject: [PATCH 14/54] cargo-codspeed: 2.3.3 -> 2.4.0 --- pkgs/development/tools/rust/cargo-codspeed/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-codspeed/default.nix b/pkgs/development/tools/rust/cargo-codspeed/default.nix index 1ae11e276056..23880c2480fc 100644 --- a/pkgs/development/tools/rust/cargo-codspeed/default.nix +++ b/pkgs/development/tools/rust/cargo-codspeed/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-codspeed"; - version = "2.3.3"; + version = "2.4.0"; src = fetchFromGitHub { owner = "CodSpeedHQ"; repo = "codspeed-rust"; rev = "v${version}"; - hash = "sha256-8wbJFvAXicchxI8FTthCiuYCZ2WA4nMUJTUD4WKG5FI="; + hash = "sha256-pi02Bn5m4JoTtCIZvxkiUVKkjmtCShKqZw+AyhaVdyY="; }; - cargoHash = "sha256-HkFROhjx4bh9QMUlCT1xj3s7aUQxn0ef3FCXoEsYCnY="; + cargoHash = "sha256-5Ps31Hdis+N/MT/o0IDHSJgHBM3F/ve50ovfFSviMtA="; nativeBuildInputs = [ curl From fe68bbc416d90d0f3a08b3426de13df2c47e2c31 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 5 Mar 2024 09:54:01 +1000 Subject: [PATCH 15/54] editorconfig-checker: 2.8.0 -> 3.0.0 Diff: https://github.com/editorconfig-checker/editorconfig-checker/compare/v2.8.0...v3.0.0 Changelog: https://github.com/editorconfig-checker/editorconfig-checker/releases/tag/v3.0.0 --- .../tools/misc/editorconfig-checker/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix index 699f6c91978c..3aedd876de6d 100644 --- a/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "editorconfig-checker"; - version = "2.8.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; - rev = version; - hash = "sha256-CVstdtFPt/OlvJE27O+CqqDpUqp9bQl18IGyf8nputM="; + rev = "v${version}"; + hash = "sha256-T2+IqHDRGpmMFOL2V6y5BbF+rfaMsKaXvQ48CFpc52I="; }; - vendorHash = "sha256-t2h9jtGfips+cpN1ckVhVgpg4egIYVXd89ahyDzV060="; + vendorHash = "sha256-vHIv3a//EfkYE/pHUXgFBgV3qvdkMx9Ka5xCk1J5Urw="; doCheck = false; From 405e9a85b7dd301221049f83325aa605f56f650a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 00:19:31 +0000 Subject: [PATCH 16/54] python311Packages.microsoft-kiota-abstractions: 1.2.0 -> 1.3.0 --- .../python-modules/microsoft-kiota-abstractions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix index c8927fb8d108..f05ac402503e 100644 --- a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "microsoft-kiota-abstractions"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "kiota-abstractions-python"; rev = "refs/tags/v${version}"; - hash = "sha256-ubDbpQhrqoyiBNne15nlO44lXg2wG+wrL8EJasMUocc="; + hash = "sha256-PAomuAOwpX5/ijVOi0hjTlUnSWgF+qsb3kpuydIV6nc="; }; nativeBuildInputs = [ From fba2e9b61a1474230d0f701ae38e5f06b5caab2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 00:28:06 +0000 Subject: [PATCH 17/54] python311Packages.microsoft-kiota-http: 1.3.0 -> 1.3.1 --- .../python-modules/microsoft-kiota-http/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/microsoft-kiota-http/default.nix b/pkgs/development/python-modules/microsoft-kiota-http/default.nix index 111bbc8302d6..a84613b82e3b 100644 --- a/pkgs/development/python-modules/microsoft-kiota-http/default.nix +++ b/pkgs/development/python-modules/microsoft-kiota-http/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "microsoft-kiota-http"; - version = "1.3.0"; + version = "1.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "microsoft"; repo = "kiota-http-python"; rev = "refs/tags/v${version}"; - hash = "sha256-N3+oAH3yWgrl0v2fm4xdCxzj7u/0fbQI3xHFht39vzA="; + hash = "sha256-I16WARk6YBr8KgE9MtHcA5VdsnLXBKcZOaqRL/eqwKE="; }; nativeBuildInputs = [ From d31a12ad5d6e6810ce392d81a42faf3b42a503fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 00:36:10 +0000 Subject: [PATCH 18/54] git-codereview: 1.9.0 -> 1.10.0 --- .../version-management/git-codereview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-codereview/default.nix b/pkgs/applications/version-management/git-codereview/default.nix index 98a616d4dff9..2bbcc10202af 100644 --- a/pkgs/applications/version-management/git-codereview/default.nix +++ b/pkgs/applications/version-management/git-codereview/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-codereview"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "golang"; repo = "review"; rev = "v${version}"; - hash = "sha256-Nnjo4MwkpFp1OTJZ+eeiJKboBGiRW520iWcJbu8cBnE="; + hash = "sha256-aLvx9lYQJYUw2XBj+2P+yEJMboUjmHKzxP5QA3N93JA="; }; vendorHash = null; From e0fe78897d445c23e7517c83337850452b0e7c1a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 00:41:24 +0000 Subject: [PATCH 19/54] gh: 2.44.1 -> 2.45.0 --- pkgs/applications/version-management/gh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index 659de8d676a3..129ae0854bd5 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.44.1"; + version = "2.45.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-ZcJY9XNkp1Glo0sQ0O9iadsvW4eterkogjlJmQeP+M4="; + hash = "sha256-jztBWn/1bDTxR/q27RYJM6boFWyduTKAtIn5zIZK2tU="; }; - vendorHash = "sha256-r1zcwBz/mJOv1RU4Ilgg73yH37xu7a/BmqgAkiODq0I="; + vendorHash = "sha256-FprVBvYPGWLcUKlWg9JU7yy2KDa/3rceAEHUIYHN4f8="; nativeBuildInputs = [ installShellFiles ]; From 3b57441bab5bb5e470d43c6de2e786c0157f2d56 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 01:09:04 +0000 Subject: [PATCH 20/54] hwatch: 0.3.10 -> 0.3.11 --- pkgs/tools/misc/hwatch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/hwatch/default.nix b/pkgs/tools/misc/hwatch/default.nix index 2eb8be5d2f93..96621948192a 100644 --- a/pkgs/tools/misc/hwatch/default.nix +++ b/pkgs/tools/misc/hwatch/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "hwatch"; - version = "0.3.10"; + version = "0.3.11"; src = fetchFromGitHub { owner = "blacknon"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-RvsL6OajXwEY77W3Wj6GMijYwn7XDnKiJyDXbNG01ag="; + sha256 = "sha256-S6hnmNnwdWd6iFM01K52oiKXiqu/0v5yvKKoeQMEqy0="; }; - cargoHash = "sha256-v7MvXnc9Xa+6QAyi2N9/WtqnvXf9M1SlR86kNjfu46Y="; + cargoHash = "sha256-P4XkbV6QlokedKumX3UbCfEaAqH9VF9IKVyZIumZ6u0="; nativeBuildInputs = [ installShellFiles ]; From b2e3feee301c44fb730f49136a3d5efa6fd6a283 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 01:20:09 +0000 Subject: [PATCH 21/54] node-problem-detector: 0.8.15 -> 0.8.16 --- .../networking/cluster/node-problem-detector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/pkgs/applications/networking/cluster/node-problem-detector/default.nix index 7084c14c8215..168f331378a6 100644 --- a/pkgs/applications/networking/cluster/node-problem-detector/default.nix +++ b/pkgs/applications/networking/cluster/node-problem-detector/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "node-problem-detector"; - version = "0.8.15"; + version = "0.8.16"; src = fetchFromGitHub { owner = "kubernetes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zuI34TBVN+ZOacn/TyTU1gVa4ujEuJfj3nKpcolH5Tg="; + sha256 = "sha256-tuukO7y+aqgu/f1DBZNUkElRTbEeZn+zkfixnFwWWwY="; }; vendorHash = null; From 2ddff143eb904c9f9fde95193ae9fdcdc10d5065 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 01:34:45 +0000 Subject: [PATCH 22/54] antidote: 1.9.4 -> 1.9.5 --- pkgs/shells/zsh/antidote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/antidote/default.nix b/pkgs/shells/zsh/antidote/default.nix index 041640de7c1c..01f6084cb591 100644 --- a/pkgs/shells/zsh/antidote/default.nix +++ b/pkgs/shells/zsh/antidote/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation (finalAttrs: { - version = "1.9.4"; + version = "1.9.5"; pname = "antidote"; src = fetchFromGitHub { owner = "mattmc3"; repo = "antidote"; rev = "v${finalAttrs.version}"; - hash = "sha256-gZBDLKkLVfHC+DHlaMS/ySUjb14Jo1192JbkDQnzi7c="; + hash = "sha256-eS2sf+N50N+oyk8wCp71hYF7WDagFBlTcAB/sFdhw9U="; }; dontPatch = true; From 2dcf4749703f591ad46349691fce1ac732fc0e50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 01:34:56 +0000 Subject: [PATCH 23/54] proxysql: 2.5.5 -> 2.6.0 --- pkgs/servers/sql/proxysql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/proxysql/default.nix b/pkgs/servers/sql/proxysql/default.nix index f75defb333fd..83824490bcd1 100644 --- a/pkgs/servers/sql/proxysql/default.nix +++ b/pkgs/servers/sql/proxysql/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "proxysql"; - version = "2.5.5"; + version = "2.6.0"; src = fetchFromGitHub { owner = "sysown"; repo = "proxysql"; rev = finalAttrs.version; - hash = "sha256-+3cOEM5b5HBQhuI+92meupvQnrUj8jgbedzPJqMoXc8="; + hash = "sha256-vFPTBSp5DPNRuhtSD34ah2074almS+jiYxBE1L9Pz6g="; }; patches = [ From 4306afac48e71e2c16ecaf95679042106a6c69a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 02:00:16 +0000 Subject: [PATCH 24/54] python312Packages.adafruit-platformdetect: 3.61.0 -> 3.62.0 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index dd5e90ef2e41..bee4d68d5d73 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.61.0"; + version = "3.62.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-hA10t/ZtMH2MjyHJJdJeOZLOF5NNTCOgGqxU6CCkZlQ="; + hash = "sha256-L2CbqWqyOo4mq+KsO8FYAyHClRKFXMLWWtfYEg0SD34="; }; nativeBuildInputs = [ From 68a242830b90ac69642531dd6adbee81160f4d86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 02:21:01 +0000 Subject: [PATCH 25/54] python312Packages.python-benedict: 0.33.1 -> 0.33.2 --- pkgs/development/python-modules/python-benedict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index 9b6ffe4e0fe8..1757de4c851b 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "python-benedict"; - version = "0.33.1"; + version = "0.33.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = "python-benedict"; rev = "refs/tags/${version}"; - hash = "sha256-QRWyMqHW4C3+718mgp9z/dQ1loesm0Vaf2TzW3yqF3A="; + hash = "sha256-1/eLJFXACn1W5Yz43BIhdqqUVk3t9285d8aLwH+VmAE="; }; pythonRelaxDeps = [ From da88d1cb6fee6faf85c6f5fa1a31d5c94e9f457c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 02:42:11 +0000 Subject: [PATCH 26/54] steamguard-cli: 0.12.6 -> 0.13.0 --- pkgs/by-name/st/steamguard-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix index c0c51c33ef5f..748c0c1e97db 100644 --- a/pkgs/by-name/st/steamguard-cli/package.nix +++ b/pkgs/by-name/st/steamguard-cli/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "steamguard-cli"; - version = "0.12.6"; + version = "0.13.0"; src = fetchFromGitHub { owner = "dyc3"; repo = pname; rev = "v${version}"; - hash = "sha256-LKzN4bNhouwOiTx3pEOLw3bDqRAhKkPi25i0yP/n0PI="; + hash = "sha256-+Lax9MaNyrsckgx7HtpXC1zBWcZNt16inY8qil0CVLQ="; }; - cargoHash = "sha256-SLbT2538maN2gQAf8BdRHpDRcYjA9lkMgCpiEYOas28="; + cargoHash = "sha256-4QyFNy7oGWKScKZXQc63TxsI3avyEVSlqJAmv+lg1GE="; nativeBuildInputs = [ installShellFiles ]; postInstall = '' From 9ef366a058f09c7cf3758b43edde47d1402178c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 02:43:10 +0000 Subject: [PATCH 27/54] sudo-font: 1.0 -> 1.1 --- pkgs/data/fonts/sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index b4c61e38d9a2..ff8f0ab312ce 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "sudo-font"; - version = "1.0"; + version = "1.1"; src = fetchzip { url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - hash = "sha256-XD+oLfPE8DD5DG5j/VN6nTVn+mhFE5qqyvjwDk2Dr/I="; + hash = "sha256-acHeaA8WIkGNrjErbLCkkUpkIZvLbgaV+pvr56ku5tw="; }; installPhase = '' From 528c73015f1988fce74fc426726f254758b49ff2 Mon Sep 17 00:00:00 2001 From: nviets Date: Sun, 25 Feb 2024 21:10:11 -0600 Subject: [PATCH 28/54] xgboost: 2.0.1 -> 2.0.3 Updating xgboost to 2.0.3 Added xgboost as meta.mainProgram Co-authored-by: Peder Bergebakken Sundt --- pkgs/development/libraries/xgboost/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index 0af51a40dfb1..b700dd2581c4 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -45,14 +45,14 @@ stdenv.mkDerivation rec { # in \ # rWrapper.override{ packages = [ xgb ]; }" pname = lib.optionalString rLibrary "r-" + pnameBase; - version = "2.0.1"; + version = "2.0.3"; src = fetchFromGitHub { owner = "dmlc"; repo = pnameBase; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-tRx6kJwIoVSN701ppuyZpIFUQIFy4LBMFyirLtwApjA="; + hash = "sha256-LWco3A6zwdnAf8blU4qjW7PFEeZaTcJlVTwVrs7nwWM="; }; nativeBuildInputs = [ cmake ] @@ -143,6 +143,7 @@ stdenv.mkDerivation rec { "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library"; homepage = "https://github.com/dmlc/xgboost"; license = licenses.asl20; + mainProgram = "xgboost"; platforms = platforms.unix; maintainers = with maintainers; [ abbradar nviets ]; }; From dd88b31dee6311e8280c7bbe6afa0eb0d2d57f06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 02:53:07 +0000 Subject: [PATCH 29/54] witness: 0.3.0 -> 0.3.1 --- pkgs/tools/security/witness/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/witness/default.nix b/pkgs/tools/security/witness/default.nix index 2b600f4a8617..0b62b31d94e1 100644 --- a/pkgs/tools/security/witness/default.nix +++ b/pkgs/tools/security/witness/default.nix @@ -10,15 +10,15 @@ buildGoModule rec { pname = "witness"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "in-toto"; repo = "witness"; rev = "v${version}"; - sha256 = "sha256-uwps/sHPgOdVhjaFxATVL5A/BGw6zPX/GSkYm802jmU="; + sha256 = "sha256-uv/HxPYOKxZskmlAxUS2I1sW4YsSAmIeNHjoJeR7VWs="; }; - vendorHash = "sha256-ktBpv2NDsha2mN3OtZWIDkneR8zi1RZkVQdvi9XPSLY="; + vendorHash = "sha256-9IkDBaDRJGWfPRN5+rYU4uH6nAsfnytDkF518rfNpyc="; nativeBuildInputs = [ installShellFiles ]; From a0c70d91971ead5e4de0d1ef4b938d2c7e1a678a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 04:30:09 +0000 Subject: [PATCH 30/54] python312Packages.aioairzone: 0.7.5 -> 0.7.6 --- pkgs/development/python-modules/aioairzone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index 78d572744aab..905232c065a3 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.7.5"; + version = "0.7.6"; pyproject = true; disabled = pythonOlder "3.11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone"; rev = "refs/tags/${version}"; - hash = "sha256-mliyDKh+7M8GQ0ZJijoYrqKDeAqRHfKGyPJM/5no+fM="; + hash = "sha256-99Km1zizAA0BF4ZlLmKOBoOQzKS/QdWpWC9dzg2s3lU="; }; nativeBuildInputs = [ From a74d811947d9c506a5fbb75522b6084d12658a84 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 04:54:27 +0000 Subject: [PATCH 31/54] rain: 1.8.0 -> 1.8.1 --- pkgs/development/tools/rain/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rain/default.nix b/pkgs/development/tools/rain/default.nix index f400bf192cd4..2f263848e020 100644 --- a/pkgs/development/tools/rain/default.nix +++ b/pkgs/development/tools/rain/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "rain"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kU+eNw27jv+yhBIR09zVRedZM5WSIMU68jCkIDWvhgw="; + sha256 = "sha256-II+SJkdlmtPuVEK+s9VLAwoe7+jYYXA+6uxAXD5NZHU="; }; vendorHash = "sha256-Ea83gPSq7lReS2KXejY9JlDDEncqS1ouVyIEKbn+VAw="; From 7e5b3274de9a2c817c8c5efd89a6a3597af89ba5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 05:03:35 +0000 Subject: [PATCH 32/54] gotestwaf: 0.4.13 -> 0.4.14 --- pkgs/tools/security/gotestwaf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gotestwaf/default.nix b/pkgs/tools/security/gotestwaf/default.nix index 41887131d9ec..fe72e598306f 100644 --- a/pkgs/tools/security/gotestwaf/default.nix +++ b/pkgs/tools/security/gotestwaf/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gotestwaf"; - version = "0.4.13"; + version = "0.4.14"; src = fetchFromGitHub { owner = "wallarm"; repo = "gotestwaf"; rev = "refs/tags/v${version}"; - hash = "sha256-juqxturQzGOlRTw7EEuRoEmwLtBdJJpbBzCKFxmL5m8="; + hash = "sha256-c8eFndK84ckwKcvu5BbIuH6SXNVyBiwEjHsHTkgwaPU="; }; vendorHash = null; From 5eb9bf07fb5e98717bd586c57173686535968594 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 05:03:44 +0000 Subject: [PATCH 33/54] sickgear: 3.30.11 -> 3.30.13 --- 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 881afa06f142..d8f37b79b4d9 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.30.11"; + version = "3.30.13"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - hash = "sha256-o5JEjKv/7TN+BCmjxVZeOcHm5FDPMg4zM6GUeO9uZUo="; + hash = "sha256-Ka2WYU2hU9aemEiTNwFZLraerfisfL8vK2ujx0wDcPo="; }; patches = [ From 8a59394d72e8144fe25de8122ebc695be0ca2165 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 07:28:32 +0000 Subject: [PATCH 34/54] python311Packages.python-keystoneclient: 5.3.0 -> 5.4.0 --- .../python-modules/python-keystoneclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-keystoneclient/default.nix b/pkgs/development/python-modules/python-keystoneclient/default.nix index 74ef6316e23c..81d3d3d217a7 100644 --- a/pkgs/development/python-modules/python-keystoneclient/default.nix +++ b/pkgs/development/python-modules/python-keystoneclient/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-keystoneclient"; - version = "5.3.0"; + version = "5.4.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-vF53GfQVZCXex311w6eZGOPQtRk3ihbY1++ohJ5MKnk="; + hash = "sha256-srS9vp2vews1O4gHZy7u0B+H3QO0+LQtDQYbCbiTH0E="; }; propagatedBuildInputs = [ From 336b778fb6d14ef13732f93b42a31ae85a18b470 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 08:23:17 +0000 Subject: [PATCH 35/54] kubeshark: 52.1.50 -> 52.1.63 --- pkgs/applications/networking/cluster/kubeshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix index e8f77216198a..b901889c0832 100644 --- a/pkgs/applications/networking/cluster/kubeshark/default.nix +++ b/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeshark"; - version = "52.1.50"; + version = "52.1.63"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = "v${version}"; - hash = "sha256-Nefi/FgIrUqCu+46sedZSirrEEJJ2OnOE1PXTQM+y2o="; + hash = "sha256-Ub8FsynnsAiLF4YwZHbhmQIJANAe/lCUgfq3ys/dtO8="; }; vendorHash = "sha256-SmvO9DYOXxnmN2dmHPPOguVwEbWSH/xNLBB+idpzopo="; From 1afbdc1c550ac8c542563538a1d7d4fe125deb47 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 5 Mar 2024 09:32:42 +0100 Subject: [PATCH 36/54] python311Packages.habluetooth: 2.4.1 -> 2.4.2 Diff: https://github.com/Bluetooth-Devices/habluetooth/compare/refs/tags/v2.4.1...v2.4.2 Changelog: https://github.com/Bluetooth-Devices/habluetooth/blob/v2.4.2/CHANGELOG.md --- pkgs/development/python-modules/habluetooth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix index 02e336c8bc1f..e84fa94ae0c1 100644 --- a/pkgs/development/python-modules/habluetooth/default.nix +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "habluetooth"; - version = "2.4.1"; + version = "2.4.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "habluetooth"; rev = "refs/tags/v${version}"; - hash = "sha256-Ka8WqOYsZFvNl7uOsGR6S4entw7GTnF9MZcOB3uJMvg="; + hash = "sha256-IoVXmq9ShwLpGtoxVOtoirSirJJ1DqBI/mP7PmK7OUs="; }; postPatch = '' From bdc45d7d790d834dab15dc603fb4ffc59029cfaa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 09:44:06 +0000 Subject: [PATCH 37/54] python311Packages.dm-haiku: 0.0.11 -> 0.0.12 --- pkgs/development/python-modules/dm-haiku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix index cb97e2f837af..e35baffb4066 100644 --- a/pkgs/development/python-modules/dm-haiku/default.nix +++ b/pkgs/development/python-modules/dm-haiku/default.nix @@ -23,14 +23,14 @@ let dm-haiku = buildPythonPackage rec { pname = "dm-haiku"; - version = "0.0.11"; + version = "0.0.12"; format = "setuptools"; src = fetchFromGitHub { owner = "deepmind"; repo = "dm-haiku"; rev = "refs/tags/v${version}"; - hash = "sha256-xve1vNsVOC6/HVtzmzswM/Sk3uUNaTtqNAKheFb/tmI="; + hash = "sha256-aJRXlMq4CNMH3ZSTDP8MgnVltdSc8l5raw4//KccL48="; }; patches = [ From aebabc6e3ae855e97793c00fcc8c09f06257bb1a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 10:46:01 +0000 Subject: [PATCH 38/54] hugo: 0.123.6 -> 0.123.7 --- pkgs/by-name/hu/hugo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index be4ee9c4ffb8..9033ad5c5bf5 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "hugo"; - version = "0.123.6"; + version = "0.123.7"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; rev = "refs/tags/v${version}"; - hash = "sha256-gLow1AcUROid6skLDdaJ9E3mPi99KPoOO/ZFdLBineU="; + hash = "sha256-uUE694xbu508vny/sbxndGlsFXnBz45fLhieuK4sX/c="; }; vendorHash = "sha256-V7YRrC+6fOIjXOu7E0kIOZZt++4oFLPhmHeWmOVU3Xw="; From d06d66849582c6a8b4f92550a21d22749edc0828 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 5 Mar 2024 12:07:50 +0100 Subject: [PATCH 39/54] python311Packages.hstspreload: 2024.2.1 -> 2024.3.1 Diff: https://github.com/sethmlarson/hstspreload/compare/refs/tags/2024.2.1...2024.3.1 --- pkgs/development/python-modules/hstspreload/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index badfd107962d..30ebd93208ea 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2024.2.1"; + version = "2024.3.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "sethmlarson"; repo = "hstspreload"; rev = "refs/tags/${version}"; - hash = "sha256-e0PQpnzYWl8IMtLFdnYPMCBioriumc3vc1ExRjCYoc8="; + hash = "sha256-TlPZg1IbgOODbkgJHWI6dNdk3jsyL2L/3qhLtXvQjqI="; }; nativeBuildInputs = [ From 4e8e7e497a56f3d025a20dce0dc1c4a0525233e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 13:27:22 +0000 Subject: [PATCH 40/54] cloudrecon: 1.0.3 -> 1.0.4 --- pkgs/by-name/cl/cloudrecon/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/cloudrecon/package.nix b/pkgs/by-name/cl/cloudrecon/package.nix index b7d1f7e73053..45b50ffcaed8 100644 --- a/pkgs/by-name/cl/cloudrecon/package.nix +++ b/pkgs/by-name/cl/cloudrecon/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "cloudrecon"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "g0ldencybersec"; repo = "CloudRecon"; rev = "refs/tags/v${version}"; - hash = "sha256-I/pdipBC+DndAGS6L4i3YoMVBTlaXNzXopD+ZxyyRmY="; + hash = "sha256-SslHkwoMelvszrQZvNX28EokBgwnPDBbTUBA9jdJPro="; }; vendorHash = "sha256-hLEmRq7Iw0hHEAla0Ehwk1EfmpBv6ddBuYtq12XdhVc="; From 4c10873f37a96d98fb51072b6f9e39b53ddc6429 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 13:31:21 +0000 Subject: [PATCH 41/54] arkade: 0.11.2 -> 0.11.4 --- pkgs/applications/networking/cluster/arkade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 0dc15c103291..82e5d12eaede 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.11.2"; + version = "0.11.4"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-G8zWPz5pTDjfZJ8DtY1DQRGYMOsGhNXWZEgFYKM/y6I="; + hash = "sha256-nRA/3dJn6hUJDppS/tt/WRIoYrRTeuY7ULZXii3LC48="; }; CGO_ENABLED = 0; From 73d23678db77626623867ca4e7eb66331d346156 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 13:31:42 +0000 Subject: [PATCH 42/54] werf: 1.2.295 -> 1.2.296 --- pkgs/applications/networking/cluster/werf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 254d7bd08ebd..6699898945d2 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "werf"; - version = "1.2.295"; + version = "1.2.296"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-oQDP2Tsxj4c5X2pfj4i+hfnsdjUBYcyF2p61OY04Ozg="; + hash = "sha256-D0bWva6Y0x9uMdKMONsiGC3SV2ktGPzfMq9BELqgk3E="; }; vendorHash = "sha256-6q13vMxu0iQgaXS+Z6V0jjSIhxMscw6sLANzK07gAlI="; From d6d96bdff4fa095c7ea43e94229c3847852205c0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 27 Feb 2024 04:23:43 +0100 Subject: [PATCH 43/54] =?UTF-8?q?ocamlPackages.ctypes:=200.20.2=20?= =?UTF-8?q?=E2=86=92=200.21.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/libbap/default.nix | 4 +- .../ocaml-modules/ctypes/default.nix | 48 +++++++------------ .../ocaml-modules/ctypes/foreign.nix | 23 +++++++++ .../ocaml-modules/hacl-star/raw.nix | 3 ++ .../ocaml-modules/janestreet/0.14.nix | 2 +- .../ocaml-modules/janestreet/0.15.nix | 2 +- .../ocaml-modules/janestreet/0.16.nix | 2 +- .../ocaml-modules/lilv/default.nix | 4 +- .../ocaml-modules/mariadb/default.nix | 14 ++++-- .../development/ocaml-modules/srt/default.nix | 4 +- .../ocaml-modules/torch/default.nix | 2 + .../ocaml-modules/tsdl/default.nix | 4 +- .../ocaml-modules/xxhash/default.nix | 6 +++ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/ocaml-packages.nix | 4 +- 15 files changed, 76 insertions(+), 48 deletions(-) create mode 100644 pkgs/development/ocaml-modules/ctypes/foreign.nix diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix index ebbf02603cbb..3ed92edd78e1 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/development/libraries/libbap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, bap, ocaml, findlib, ctypes, autoreconfHook, +{ lib, stdenv, fetchFromGitHub, bap, ocaml, findlib, ctypes, ctypes-foreign, autoreconfHook, which }: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ autoreconfHook which ocaml findlib ]; - buildInputs = [ bap ctypes ]; + buildInputs = [ bap ctypes ctypes-foreign ]; preInstall = '' mkdir -p $out/lib diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index fa9cde044e8a..a10abff96b21 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -1,49 +1,35 @@ -{ lib, stdenv, fetchFromGitHub, ocaml, findlib, libffi, pkg-config, ncurses, integers, bigarray-compat }: +{ lib +, ocaml +, fetchFromGitHub +, buildDunePackage +, dune-configurator +, integers +, bigarray-compat +, ounit2 +}: -if lib.versionOlder ocaml.version "4.02" -then throw "ctypes is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-ctypes"; - version = "0.20.2"; +buildDunePackage rec { + pname = "ctypes"; + version = "0.21.1"; src = fetchFromGitHub { owner = "ocamllabs"; repo = "ocaml-ctypes"; rev = version; - hash = "sha256-LzUrR8K88CjY/R5yUK3y6KG85hUMjbzuebHGqI8KhhM="; + hash = "sha256-Cay+8dwFxw4d1OgMP4CR94l4ic2269YCAaziesEqwHM="; }; - nativeBuildInputs = [ pkg-config ocaml findlib ]; - buildInputs = [ ncurses ]; - propagatedBuildInputs = [ integers libffi bigarray-compat ]; + buildInputs = [ dune-configurator ]; - strictDeps = true; + propagatedBuildInputs = [ integers bigarray-compat ]; - preConfigure = '' - substituteInPlace META --replace ' bytes ' ' ' - ''; - - buildPhase = '' - runHook preBuild - make XEN=false libffi.config ctypes-base ctypes-stubs - make XEN=false ctypes-foreign - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs - make install XEN=false - runHook postInstall - ''; + doCheck = lib.versionAtLeast ocaml.version "4.08"; + checkInputs = [ ounit2 ]; meta = with lib; { homepage = "https://github.com/ocamllabs/ocaml-ctypes"; description = "Library for binding to C libraries using pure OCaml"; license = licenses.mit; maintainers = [ maintainers.ericbmerritt ]; - inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/ctypes/foreign.nix b/pkgs/development/ocaml-modules/ctypes/foreign.nix new file mode 100644 index 000000000000..5c9efad790f2 --- /dev/null +++ b/pkgs/development/ocaml-modules/ctypes/foreign.nix @@ -0,0 +1,23 @@ +{ buildDunePackage +, ctypes +, dune-configurator +, libffi +, ounit2 +, lwt +}: + +buildDunePackage rec { + pname = "ctypes-foreign"; + + inherit (ctypes) version src doCheck; + + buildInputs = [ dune-configurator ]; + + propagatedBuildInputs = [ ctypes libffi ]; + + checkInputs = [ ounit2 lwt ]; + + meta = ctypes.meta // { + description = "Dynamic access to foreign C libraries using Ctypes"; + }; +} diff --git a/pkgs/development/ocaml-modules/hacl-star/raw.nix b/pkgs/development/ocaml-modules/hacl-star/raw.nix index 00b524606fcf..b4b8c1741535 100644 --- a/pkgs/development/ocaml-modules/hacl-star/raw.nix +++ b/pkgs/development/ocaml-modules/hacl-star/raw.nix @@ -27,7 +27,10 @@ stdenv.mkDerivation rec { # strictoverflow is disabled because it breaks aarch64-darwin hardeningDisable = [ "strictoverflow" ]; + # Compatibility with ctypes ≥ 0.21 + # see: https://github.com/cryspen/hacl-packages/commit/81303b83a54a92d3b5f54f1b8ddbea60438cc2bf postPatch = '' + substituteInPlace hacl-star-raw/META --replace-warn 'requires="ctypes"' 'requires="ctypes ctypes.stubs"' patchShebangs ./ ''; diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index 249f9c3115d6..7d8bdc4dfb7d 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -130,7 +130,7 @@ with self; hash = "0ykys3ckpsx5crfgj26v2q3gy6wf684aq0bfb4q8p92ivwznvlzy"; meta.description = "Async wrappers for SSL"; buildInputs = [ dune-configurator ]; - propagatedBuildInputs = [ async ctypes openssl ]; + propagatedBuildInputs = [ async ctypes ctypes-foreign openssl ]; # in ctypes.foreign 0.18.0 threaded and unthreaded have been merged postPatch = '' substituteInPlace bindings/dune \ diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix index ccd2d4eab299..f64e228a2b81 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -144,7 +144,7 @@ with self; hash = "1b7f7p3xj4jr2n2dxy2lp7a9k7944w6x2nrg6524clvcsd1ax4hn"; meta.description = "Async wrappers for SSL"; buildInputs = [ dune-configurator ]; - propagatedBuildInputs = [ async ctypes openssl ]; + propagatedBuildInputs = [ async ctypes ctypes-foreign openssl ]; # in ctypes.foreign 0.18.0 threaded and unthreaded have been merged postPatch = '' substituteInPlace bindings/dune \ diff --git a/pkgs/development/ocaml-modules/janestreet/0.16.nix b/pkgs/development/ocaml-modules/janestreet/0.16.nix index bba99ebb29d1..562364df53bc 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.16.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.16.nix @@ -146,7 +146,7 @@ with self; hash = "sha256-83YKxvVb/JwBnQG4R/R1Ztik9T/hO4cbiNTfFnErpG4="; meta.description = "Async wrappers for SSL"; buildInputs = [ dune-configurator ]; - propagatedBuildInputs = [ async ctypes openssl ]; + propagatedBuildInputs = [ async ctypes ctypes-foreign openssl ]; }; async_unix = janePackage { diff --git a/pkgs/development/ocaml-modules/lilv/default.nix b/pkgs/development/ocaml-modules/lilv/default.nix index 501182db7a96..a5def260eb29 100644 --- a/pkgs/development/ocaml-modules/lilv/default.nix +++ b/pkgs/development/ocaml-modules/lilv/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, ctypes, lilv }: +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, ctypes, ctypes-foreign, lilv }: buildDunePackage rec { pname = "lilv"; @@ -14,7 +14,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.03.0"; buildInputs = [ dune-configurator ]; - propagatedBuildInputs = [ ctypes lilv ]; + propagatedBuildInputs = [ ctypes ctypes-foreign lilv ]; meta = with lib; { homepage = "https://github.com/savonet/ocaml-lilv"; diff --git a/pkgs/development/ocaml-modules/mariadb/default.nix b/pkgs/development/ocaml-modules/mariadb/default.nix index 397402481839..3ac6027b22fd 100644 --- a/pkgs/development/ocaml-modules/mariadb/default.nix +++ b/pkgs/development/ocaml-modules/mariadb/default.nix @@ -15,10 +15,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-3/C1Gz6luUzS7oaudLlDHMT6JB2v5OdbLVzJhtayHGM="; }; - patches = fetchpatch { - url = "https://github.com/andrenth/ocaml-mariadb/commit/9db2e4d8dec7c584213d0e0f03d079a36a35d9d5.patch"; - hash = "sha256-heROtU02cYBJ5edIHMdYP1xNXcLv8h79GYGBuudJhgE="; - }; + patches = lib.lists.map (x: + fetchpatch { + url = "https://github.com/andrenth/ocaml-mariadb/commit/${x.path}.patch"; + inherit (x) hash; + }) + [ { path = "9db2e4d8dec7c584213d0e0f03d079a36a35d9d5"; + hash = "sha256-heROtU02cYBJ5edIHMdYP1xNXcLv8h79GYGBuudJhgE="; } + { path = "40cd3102bc7cce4ed826ed609464daeb1bbb4581"; + hash = "sha256-YVsAMJiOgWRk9xPaRz2sDihBYLlXv+rhWtQIMOVLtSg="; } + ]; postPatch = '' substituteInPlace setup.ml --replace '#use "topfind"' \ diff --git a/pkgs/development/ocaml-modules/srt/default.nix b/pkgs/development/ocaml-modules/srt/default.nix index 92431fcb3489..d1e5ecd9ad55 100644 --- a/pkgs/development/ocaml-modules/srt/default.nix +++ b/pkgs/development/ocaml-modules/srt/default.nix @@ -2,6 +2,7 @@ , dune-configurator , posix-socket , srt +, ctypes-foreign }: buildDunePackage rec { @@ -9,7 +10,6 @@ buildDunePackage rec { version = "0.3.0"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; src = fetchFromGitHub { owner = "savonet"; @@ -19,7 +19,7 @@ buildDunePackage rec { }; buildInputs = [ dune-configurator ]; - propagatedBuildInputs = [ posix-socket srt ]; + propagatedBuildInputs = [ ctypes-foreign posix-socket srt ]; meta = with lib; { description = "OCaml bindings for the libsrt library"; diff --git a/pkgs/development/ocaml-modules/torch/default.nix b/pkgs/development/ocaml-modules/torch/default.nix index a22a9ea68ddc..5acef0f2a72c 100644 --- a/pkgs/development/ocaml-modules/torch/default.nix +++ b/pkgs/development/ocaml-modules/torch/default.nix @@ -5,6 +5,7 @@ , fetchpatch , cmdliner , ctypes +, ctypes-foreign , dune-configurator , npy , ocaml-compiler-libs @@ -42,6 +43,7 @@ buildDunePackage rec { propagatedBuildInputs = [ cmdliner ctypes + ctypes-foreign npy ocaml-compiler-libs ppx_custom_printf diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 14c29f3daee0..2d35f76d5bf0 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkg-config +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, ctypes-foreign, result, SDL2, pkg-config , AudioToolbox, Cocoa, CoreAudio, CoreVideo, ForceFeedback }: if lib.versionOlder ocaml.version "4.03" @@ -24,7 +24,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ocaml findlib ocamlbuild topkg ]; buildInputs = [ topkg ]; - propagatedBuildInputs = [ SDL2 ctypes ] + propagatedBuildInputs = [ SDL2 ctypes ctypes-foreign ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox Cocoa CoreAudio CoreVideo ForceFeedback ]; preConfigure = '' diff --git a/pkgs/development/ocaml-modules/xxhash/default.nix b/pkgs/development/ocaml-modules/xxhash/default.nix index fe212dd0eb70..d8ef8f3d60ef 100644 --- a/pkgs/development/ocaml-modules/xxhash/default.nix +++ b/pkgs/development/ocaml-modules/xxhash/default.nix @@ -3,6 +3,7 @@ , buildDunePackage , xxHash , ctypes +, ctypes-foreign , dune-configurator , ppx_expect }: @@ -20,12 +21,17 @@ buildDunePackage rec { hash = "sha256-0+ac5EWV9DCVMT4wOcXC95GVEwsUIZzFn2laSzmK6jE="; }; + postPatch = '' + substituteInPlace stubs/dune --replace-warn 'ctypes))' 'ctypes ctypes.stubs))' + ''; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ ctypes + ctypes-foreign xxHash ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36d721bdcf84..a52ea0f43ace 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22209,7 +22209,7 @@ with pkgs; libbacktrace = callPackage ../development/libraries/libbacktrace { }; libbap = callPackage ../development/libraries/libbap { - inherit (ocaml-ng.ocamlPackages_4_14) bap ocaml findlib ctypes; + inherit (ocaml-ng.ocamlPackages_4_14) bap ocaml findlib ctypes ctypes-foreign; }; libbaseencode = callPackage ../development/libraries/libbaseencode { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 354e3a4e6d64..3b49788c4f40 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -283,6 +283,8 @@ let ctypes = callPackage ../development/ocaml-modules/ctypes { }; + ctypes-foreign = callPackage ../development/ocaml-modules/ctypes/foreign.nix { }; + ctypes_stubs_js = callPackage ../development/ocaml-modules/ctypes_stubs_js { inherit (pkgs) nodejs; }; @@ -786,7 +788,7 @@ let inherit conduit ipaddr-sexp; }; in { - inherit (self) dune-configurator alcotest re num octavius uutf ounit ctypes; + inherit (self) dune-configurator alcotest re num octavius uutf ounit ctypes ctypes-foreign; ppxlib = self.ppxlib.override { inherit (self') stdio; }; cohttp-async = self.cohttp-async.override { inherit (self') ppx_sexp_conv base async async_kernel async_unix core_unix sexplib0 core; From 4163445f942f3c9a02b2cbdbf4db4cf3c27d07b7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 27 Feb 2024 04:23:52 +0100 Subject: [PATCH 44/54] =?UTF-8?q?ocamlPackages.ctypes:=200.21.1=20?= =?UTF-8?q?=E2=86=92=200.22.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/ctypes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index a10abff96b21..fa7bf6a587f0 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -10,13 +10,13 @@ buildDunePackage rec { pname = "ctypes"; - version = "0.21.1"; + version = "0.22.0"; src = fetchFromGitHub { owner = "ocamllabs"; repo = "ocaml-ctypes"; rev = version; - hash = "sha256-Cay+8dwFxw4d1OgMP4CR94l4ic2269YCAaziesEqwHM="; + hash = "sha256-xgDKupQuakjHTbjoap/r2aAjNQUpH9K4HmeLbbgw1x4="; }; buildInputs = [ dune-configurator ]; From 849a71182181159796f4cc5aef24c1d811f67181 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 14:38:37 +0000 Subject: [PATCH 45/54] julia-mono: 0.053 -> 0.054 --- pkgs/data/fonts/julia-mono/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/data/fonts/julia-mono/default.nix index 6b343bcb163d..dc9ebf5ef25f 100644 --- a/pkgs/data/fonts/julia-mono/default.nix +++ b/pkgs/data/fonts/julia-mono/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "JuliaMono-ttf"; - version = "0.053"; + version = "0.054"; src = fetchzip { url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz"; stripRoot = false; - hash = "sha256-KvDyT0T8ecpSoNmqvsvDMooWNNe+z/PvxYj1Nd6qqfA="; + hash = "sha256-DtvaFu3r2r5WmlFCbkbzqAk/Y2BNEnxR6hPDfKM+/aQ="; }; installPhase = '' From cba3d0d236d6e121e88fa14056489ac080d9a4fe Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Sun, 3 Mar 2024 18:07:00 +0000 Subject: [PATCH 46/54] homepage-dashboard: patch to enable control of log targets This piece of software is generally used (and documented upstream) in containers. It is common practice for such applications to log both to stdout, and to a file which can be volume-mounted in the container. Because the intention here is to start with systemd, it makes less sense to have both, so this added patch stops the application from trying to create a log directory alongside the config directory. --- pkgs/servers/homepage-dashboard/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/servers/homepage-dashboard/default.nix index 7a28803df611..6f0a94500ef0 100644 --- a/pkgs/servers/homepage-dashboard/default.nix +++ b/pkgs/servers/homepage-dashboard/default.nix @@ -39,6 +39,20 @@ buildNpmPackage rec { npmDepsHash = "sha256-u15lDdXnV3xlXAC9WQQKLIeV/AgtRM1sFNsacw3j6kU="; + # This project is primarily designed to be consumed through Docker. + # By default it logs to stdout, and also to a directory. This makes + # little sense here where all the logs will be collated in the + # systemd journal anyway, so the patch removes the file logging. + # This patch has been suggested upstream, but the contribution won't + # be accepted until it gets at least 10 upvotes, per their policy: + # https://github.com/gethomepage/homepage/discussions/3067 + patches = [ + (fetchpatch { + url = "https://github.com/gethomepage/homepage/commit/3be28a2c8b68f2404e4083e7f32eebbccdc4d293.patch"; + hash = "sha256-5fUOXiHBZ4gdPeOHe1NIaBLaHJTDImsRjSwtueQOEXY="; + }) + ]; + preBuild = '' mkdir -p config ''; From c0330351a06ffebc70e4bbcfe9bad43449aab4b7 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Mon, 26 Feb 2024 12:00:01 +0000 Subject: [PATCH 47/54] nixos/homepage-dashboard: support structured config --- .../services/misc/homepage-dashboard.nix | 226 ++++++++++++++++-- 1 file changed, 207 insertions(+), 19 deletions(-) diff --git a/nixos/modules/services/misc/homepage-dashboard.nix b/nixos/modules/services/misc/homepage-dashboard.nix index 07a09e2b6bbf..02f1378cb0d5 100644 --- a/nixos/modules/services/misc/homepage-dashboard.nix +++ b/nixos/modules/services/misc/homepage-dashboard.nix @@ -6,6 +6,8 @@ let cfg = config.services.homepage-dashboard; + # Define the settings format used for this program + settingsFormat = pkgs.formats.yaml { }; in { options = { @@ -25,31 +27,217 @@ in default = 8082; description = lib.mdDoc "Port for Homepage to bind to."; }; + + environmentFile = lib.mkOption { + type = lib.types.str; + description = '' + The path to an environment file that contains environment variables to pass + to the homepage-dashboard service, for the purpose of passing secrets to + the service. + + See the upstream documentation: + + https://gethomepage.dev/latest/installation/docker/#using-environment-secrets + ''; + default = ""; + }; + + customCSS = lib.mkOption { + type = lib.types.lines; + description = lib.mdDoc '' + Custom CSS for styling Homepage. + + See https://gethomepage.dev/latest/configs/custom-css-js/. + ''; + default = ""; + }; + + customJS = lib.mkOption { + type = lib.types.lines; + description = lib.mdDoc '' + Custom Javascript for Homepage. + + See https://gethomepage.dev/latest/configs/custom-css-js/. + ''; + default = ""; + }; + + bookmarks = lib.mkOption { + inherit (settingsFormat) type; + description = lib.mdDoc '' + Homepage bookmarks configuration. + + See https://gethomepage.dev/latest/configs/bookmarks/. + ''; + # Defaults: https://github.com/gethomepage/homepage/blob/main/src/skeleton/bookmarks.yaml + example = [ + { + Developer = [ + { Github = [{ abbr = "GH"; href = "https://github.com/"; }]; } + ]; + } + { + Entertainment = [ + { YouTube = [{ abbr = "YT"; href = "https://youtube.com/"; }]; } + ]; + } + ]; + default = [ ]; + }; + + services = lib.mkOption { + inherit (settingsFormat) type; + description = lib.mdDoc '' + Homepage services configuration. + + See https://gethomepage.dev/latest/configs/services/. + ''; + # Defaults: https://github.com/gethomepage/homepage/blob/main/src/skeleton/services.yaml + example = [ + { + "My First Group" = [ + { + "My First Service" = { + href = "http://localhost/"; + description = "Homepage is awesome"; + }; + } + ]; + } + { + "My Second Group" = [ + { + "My Second Service" = { + href = "http://localhost/"; + description = "Homepage is the best"; + }; + } + ]; + } + ]; + default = [ ]; + }; + + widgets = lib.mkOption { + inherit (settingsFormat) type; + description = lib.mdDoc '' + Homepage widgets configuration. + + See https://gethomepage.dev/latest/configs/service-widgets/. + ''; + # Defaults: https://github.com/gethomepage/homepage/blob/main/src/skeleton/widgets.yaml + example = [ + { + resources = { + cpu = true; + memory = true; + disk = "/"; + }; + } + { + search = { + provider = "duckduckgo"; + target = "_blank"; + }; + } + ]; + default = [ ]; + }; + + kubernetes = lib.mkOption { + inherit (settingsFormat) type; + description = lib.mdDoc '' + Homepage kubernetes configuration. + + See https://gethomepage.dev/latest/configs/kubernetes/. + ''; + default = { }; + }; + + docker = lib.mkOption { + inherit (settingsFormat) type; + description = lib.mdDoc '' + Homepage docker configuration. + + See https://gethomepage.dev/latest/configs/docker/. + ''; + default = { }; + }; + + settings = lib.mkOption { + inherit (settingsFormat) type; + description = lib.mdDoc '' + Homepage settings. + + See https://gethomepage.dev/latest/configs/settings/. + ''; + # Defaults: https://github.com/gethomepage/homepage/blob/main/src/skeleton/settings.yaml + default = { }; + }; }; }; - config = lib.mkIf cfg.enable { - systemd.services.homepage-dashboard = { - description = "Homepage Dashboard"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; + config = + let + # If homepage-dashboard is enabled, but none of the configuration values have been updated, + # then default to "unmanaged" configuration which is manually updated in + # var/lib/homepage-dashboard. This is to maintain backwards compatibility, and should be + # deprecated in a future release. + managedConfig = !( + cfg.bookmarks == [ ] && + cfg.customCSS == "" && + cfg.customJS == "" && + cfg.docker == { } && + cfg.kubernetes == { } && + cfg.services == [ ] && + cfg.settings == { } && + cfg.widgets == [ ] + ); - environment = { - HOMEPAGE_CONFIG_DIR = "/var/lib/homepage-dashboard"; - PORT = "${toString cfg.listenPort}"; + configDir = if managedConfig then "/etc/homepage-dashboard" else "/var/lib/homepage-dashboard"; + + msg = "using unmanaged configuration for homepage-dashboard is deprecated and will be removed" + + " in 24.05. please see the NixOS documentation for `services.homepage-dashboard' and add" + + " your bookmarks, services, widgets, and other configuration using the options provided."; + in + lib.mkIf cfg.enable { + warnings = lib.optional (!managedConfig) msg; + + environment.etc = lib.mkIf managedConfig { + "homepage-dashboard/custom.css".text = cfg.customCSS; + "homepage-dashboard/custom.js".text = cfg.customJS; + + "homepage-dashboard/bookmarks.yaml".source = settingsFormat.generate "bookmarks.yaml" cfg.bookmarks; + "homepage-dashboard/docker.yaml".source = settingsFormat.generate "docker.yaml" cfg.docker; + "homepage-dashboard/kubernetes.yaml".source = settingsFormat.generate "kubernetes.yaml" cfg.kubernetes; + "homepage-dashboard/services.yaml".source = settingsFormat.generate "services.yaml" cfg.services; + "homepage-dashboard/settings.yaml".source = settingsFormat.generate "settings.yaml" cfg.settings; + "homepage-dashboard/widgets.yaml".source = settingsFormat.generate "widgets.yaml" cfg.widgets; }; - serviceConfig = { - Type = "simple"; - DynamicUser = true; - StateDirectory = "homepage-dashboard"; - ExecStart = "${lib.getExe cfg.package}"; - Restart = "on-failure"; + systemd.services.homepage-dashboard = { + description = "Homepage Dashboard"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + environment = { + HOMEPAGE_CONFIG_DIR = configDir; + PORT = toString cfg.listenPort; + LOG_TARGETS = lib.mkIf managedConfig "stdout"; + }; + + serviceConfig = { + Type = "simple"; + DynamicUser = true; + EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile; + StateDirectory = lib.mkIf (!managedConfig) "homepage-dashboard"; + ExecStart = lib.getExe cfg.package; + Restart = "on-failure"; + }; + }; + + networking.firewall = lib.mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.listenPort ]; }; }; - - networking.firewall = lib.mkIf cfg.openFirewall { - allowedTCPPorts = [ cfg.listenPort ]; - }; - }; } From 183bc82cca1e3175cc3bfda91fb2525bb3b88c05 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Mon, 26 Feb 2024 18:03:28 +0000 Subject: [PATCH 48/54] nixos/homepage-dashboard: add breaking change notice to release notes --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index b5973c19a2c4..08cba1790ca2 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -134,6 +134,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `paperless`' `services.paperless.extraConfig` setting has been removed and converted to the freeform type and option named `services.paperless.settings`. +- `services.homepage-dashboard` now takes it's configuration using native Nix expressions, rather than dumping templated configurations into `/var/lib/homepage-dashboard` where they were previously managed manually. There are now new options which allow the configuration of bookmarks, services, widgets and custom CSS/JS natively in Nix. + - The legacy and long deprecated systemd target `network-interfaces.target` has been removed. Use `network.target` instead. - `services.frp.settings` now generates the frp configuration file in TOML format as [recommended by upstream](https://github.com/fatedier/frp#configuration-files), instead of the legacy INI format. This has also introduced other changes in the configuration file structure and options. From 0b39e86cbc509bbe7d6e0a5c10f4860e68483e53 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Sun, 3 Mar 2024 18:07:28 +0000 Subject: [PATCH 49/54] nixosTests.homepage-dashboard: test managed and unmanaged configs --- nixos/tests/homepage-dashboard.nix | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/nixos/tests/homepage-dashboard.nix b/nixos/tests/homepage-dashboard.nix index 56e077f5ff6d..dd36473e8ac0 100644 --- a/nixos/tests/homepage-dashboard.nix +++ b/nixos/tests/homepage-dashboard.nix @@ -2,13 +2,35 @@ import ./make-test-python.nix ({ lib, ... }: { name = "homepage-dashboard"; meta.maintainers = with lib.maintainers; [ jnsgruk ]; - nodes.machine = { pkgs, ... }: { + nodes.unmanaged_conf = { pkgs, ... }: { services.homepage-dashboard.enable = true; }; + nodes.managed_conf = { pkgs, ... }: { + services.homepage-dashboard = { + enable = true; + settings.title = "custom"; + }; + }; + testScript = '' - machine.wait_for_unit("homepage-dashboard.service") - machine.wait_for_open_port(8082) - machine.succeed("curl --fail http://localhost:8082/") + # Ensure the services are started on unmanaged machine + unmanaged_conf.wait_for_unit("homepage-dashboard.service") + unmanaged_conf.wait_for_open_port(8082) + unmanaged_conf.succeed("curl --fail http://localhost:8082/") + + # Ensure that /etc/homepage-dashboard doesn't exist, and boilerplate + # configs are copied into place. + unmanaged_conf.fail("test -d /etc/homepage-dashboard") + unmanaged_conf.succeed("test -f /var/lib/private/homepage-dashboard/settings.yaml") + + # Ensure the services are started on managed machine + managed_conf.wait_for_unit("homepage-dashboard.service") + managed_conf.wait_for_open_port(8082) + managed_conf.succeed("curl --fail http://localhost:8082/") + + # Ensure /etc/homepage-dashboard is created and unmanaged conf location isn't. + managed_conf.succeed("test -d /etc/homepage-dashboard") + managed_conf.fail("test -f /var/lib/private/homepage-dashboard/settings.yaml") ''; }) From 2cec1262a33923ddb5655190a4212d317200f7e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 5 Mar 2024 15:53:51 +0100 Subject: [PATCH 50/54] python3Packages.aioquic: patch for newer service-identity --- pkgs/development/python-modules/aioquic/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/aioquic/default.nix b/pkgs/development/python-modules/aioquic/default.nix index 0d9801df1f82..071fe70dd962 100644 --- a/pkgs/development/python-modules/aioquic/default.nix +++ b/pkgs/development/python-modules/aioquic/default.nix @@ -3,6 +3,7 @@ , certifi , cryptography , fetchPypi +, fetchpatch , openssl , pylsqpack , pyopenssl @@ -24,6 +25,13 @@ buildPythonPackage rec { hash = "sha256-cHlceJBTJthVwq5SQHIjSq5YbHibgSkuJy0CHpsEMKM="; }; + patches = [ + (fetchpatch { + url = "https://github.com/aiortc/aioquic/commit/e899593805e0b31325a1d347504eb8e6100fe87d.diff"; + hash = "sha256-TTpIIWX/R4k2KxhsN17O9cRW/dN0AARYnju8JTht3D8="; + }) + ]; + nativeBuildInputs = [ setuptools ]; From a8979c1d4169cbaae26b1bad5e97482899eb703b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 15:46:53 +0000 Subject: [PATCH 51/54] renode-unstable: 1.14.0+20240226git732d357b4 -> 1.14.0+20240305gitcec51e561 --- pkgs/by-name/re/renode-unstable/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix index 6f53c1c45045..cf31a1208b22 100644 --- a/pkgs/by-name/re/renode-unstable/package.nix +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -7,10 +7,10 @@ inherit buildUnstable; }).overrideAttrs (finalAttrs: _: { pname = "renode-unstable"; - version = "1.14.0+20240226git732d357b4"; + version = "1.14.0+20240305gitcec51e561"; src = fetchurl { url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz"; - hash = "sha256-08xV/6ch6dWA4pwg8tuDywYhQ4ZIFRD5zegojDZtAHE="; + hash = "sha256-dXT4C/s7Aygqhq0U6MiPsQL8ZvjPfTzKYuhA6aRQKlI="; }; }) From 53e51f97f6085ffa8793d9b8f6d7aaecc5d3ebcf Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 26 Feb 2024 21:33:00 +0100 Subject: [PATCH 52/54] =?UTF-8?q?pythonPackages.nbxmpp:=204.5.3=20?= =?UTF-8?q?=E2=86=92=204.5.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/nbxmpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index d070b4317eed..22cc74504f67 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "4.5.3"; + version = "4.5.4"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "gajim"; repo = "python-nbxmpp"; rev = "refs/tags/${version}"; - hash = "sha256-vAuHfG2/DVUDCxUb7UMRejIh4fQHGl67A+dncvcJ8jQ="; + hash = "sha256-n5Pzw8aikzCml+dOhkLoHR0ytFkEb4AYpw/bIpo6Wd4="; }; nativeBuildInputs = [ From 8195cd8227b62734ef632ebaa58305cf439075f3 Mon Sep 17 00:00:00 2001 From: SamLukeYes Date: Wed, 6 Mar 2024 00:39:26 +0800 Subject: [PATCH 53/54] pacman: 6.0.2 -> 6.1.0 --- .../package-management/pacman/default.nix | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix index 800e392f0f24..90252dca9cb2 100644 --- a/pkgs/tools/package-management/pacman/default.nix +++ b/pkgs/tools/package-management/pacman/default.nix @@ -1,7 +1,6 @@ { lib , stdenv -, fetchpatch -, fetchurl +, fetchFromGitLab , asciidoc , binutils , coreutils @@ -39,19 +38,23 @@ , sysHookDir ? "/usr/share/libalpm/hooks/" }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (final: { pname = "pacman"; - version = "6.0.2"; + version = "6.1.0"; - src = fetchurl { - url = "https://sources.archlinux.org/other/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-fY4+jFEhrsCWXfcfWb7fRgUsbPFPljZcRBHsPeCkwaU="; + src = fetchFromGitLab { + domain = "gitlab.archlinux.org"; + owner = "pacman"; + repo = "pacman"; + rev = "v${final.version}"; + hash = "sha256-uHBq1A//YSqFATlyqjC5ZgmvPkNKqp7sVew+nbmLH78="; }; strictDeps = true; nativeBuildInputs = [ asciidoc + gettext installShellFiles libarchive makeWrapper @@ -71,11 +74,6 @@ stdenv.mkDerivation rec { patches = [ ./dont-create-empty-dirs.patch - # Add keyringdir meson option to configure the keyring directory - (fetchpatch { - url = "https://gitlab.archlinux.org/pacman/pacman/-/commit/79bd512181af12ec80fd8f79486fc9508fa4a1b3.patch"; - hash = "sha256-ivTPwWe06Q5shn++R6EY0x3GC0P4X0SuC+F5sndfAtM="; - }) ]; postPatch = let compressionTools = [ @@ -93,16 +91,16 @@ stdenv.mkDerivation rec { substituteInPlace meson.build \ --replace "install_dir : SYSCONFDIR" "install_dir : '$out/etc'" \ --replace "join_paths(DATAROOTDIR, 'libalpm/hooks/')" "'${sysHookDir}'" \ - --replace "join_paths(PREFIX, DATAROOTDIR, get_option('keyringdir'))" "'\$KEYRING_IMPORT_DIR'" + --replace "join_paths(PREFIX, DATAROOTDIR, get_option('keyringdir'))" "'\$KEYRING_IMPORT_DIR'" \ + --replace "join_paths(SYSCONFDIR, 'makepkg.conf.d/')" "'$out/etc/makepkg.conf.d/'" substituteInPlace doc/meson.build \ --replace "/bin/true" "${coreutils}/bin/true" substituteInPlace scripts/repo-add.sh.in \ --replace bsdtar "${libarchive}/bin/bsdtar" substituteInPlace scripts/pacman-key.sh.in \ --replace "local KEYRING_IMPORT_DIR='@keyringdir@'" "" \ - --subst-var-by keyringdir '\$KEYRING_IMPORT_DIR' \ - --replace "--batch --check-trustdb" "--batch --check-trustdb --allow-weak-key-signatures" - ''; # the line above should be removed once Arch migrates to gnupg 2.3.x + --subst-var-by keyringdir '\$KEYRING_IMPORT_DIR' + ''; mesonFlags = [ "--sysconfdir=/etc" @@ -132,6 +130,7 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.archlinux.org/pacman/pacman/-/raw/v${version}/NEWS"; license = licenses.gpl2Plus; platforms = platforms.linux; + mainProgram = "pacman"; maintainers = with maintainers; [ samlukeyes123 ]; }; -} +}) From a07dd748d9591d00f53d0ea741fc0dd00397a879 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Tue, 5 Mar 2024 09:14:43 -0800 Subject: [PATCH 54/54] nixos-option: update to nix 2.18 This utility has horrendous code quality, partially due to nix's fault, and really desperately needs to be rewritten, hopefully to not use the nix C++ API. Either use the Python bindings to the Nix C API when the Nix team merges the C API, or just write a clever bit of Nix script to extract the data from a config, turn it into json, then process it into good output in a CLI wrapper. It currently does not support flakes and has many other issues. (in my testing it did not accept -I nixos-path, it exploded due to having plugins in /etc/nix/nix.conf with no way to override that, among other breakage that simply does not exist in the Nix CLI). --- pkgs/tools/nix/nixos-option/nixos-option.cc | 16 ++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/nix/nixos-option/nixos-option.cc b/pkgs/tools/nix/nixos-option/nixos-option.cc index e2a73866d0ed..d8c3d46c4fa1 100644 --- a/pkgs/tools/nix/nixos-option/nixos-option.cc +++ b/pkgs/tools/nix/nixos-option/nixos-option.cc @@ -368,20 +368,20 @@ std::string describeError(const Error & e) { return "«error: " + e.msg() + "»" void describeDerivation(Context & ctx, Out & out, Value v) { // Copy-pasted from nix/src/nix/repl.cc :( + out << "«derivation "; Bindings::iterator i = v.attrs->find(ctx.state.sDrvPath); - PathSet pathset; - try { - Path drvPath = i != v.attrs->end() ? ctx.state.coerceToPath(i->pos, *i->value, pathset, "while evaluating the drvPath of a derivation") : "???"; - out << "«derivation " << drvPath << "»"; - } catch (Error & e) { - out << describeError(e); - } + nix::NixStringContext strContext; + if (i != v.attrs->end()) + out << ctx.state.store->printStorePath(ctx.state.coerceToStorePath(i->pos, *i->value, strContext, "while evaluating the drvPath of a derivation")); + else + out << "???"; + out << "»"; } Value parseAndEval(EvalState & state, const std::string & expression, const std::string & path) { Value v{}; - state.eval(state.parseExprFromString(expression, absPath(path)), v); + state.eval(state.parseExprFromString(expression, nix::SourcePath(nix::CanonPath::fromCwd(path))), v); return v; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a52ea0f43ace..5529efaa7844 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40368,7 +40368,7 @@ with pkgs; nix-melt = callPackage ../tools/nix/nix-melt { }; nixos-option = callPackage ../tools/nix/nixos-option { - nix = nixVersions.nix_2_15; + nix = nixVersions.nix_2_18; }; nix-pin = callPackage ../tools/package-management/nix-pin { };