From 1d9ece4920520f3b10cd550e1d7c359beb902290 Mon Sep 17 00:00:00 2001 From: Stefan Weigl-Bosker Date: Wed, 5 Mar 2025 21:35:18 -0500 Subject: [PATCH 001/107] maintainers: add sweiglbosker --- maintainers/maintainer-list.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7b4ce772050a..5c87cf89c1b0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -22792,6 +22792,17 @@ github = "sweenu"; githubId = 7051978; }; + sweiglbosker = { + email = "stefan@s00.xyz"; + github = "sweiglbosker"; + githubId = 124390044; + name = "Stefan Weigl-Bosker"; + keys = [ + { + fingerprint = "B520 0ABF BD21 3FC9 C17C 6DB9 1291 CBBC F3B9 F225"; + } + ]; + }; swendel = { name = "Sebastian Wendel"; email = "nixpkgs.aiX5ph@srx.digital"; From b5fd59113df5778b03926f8f3a052f3f849a57b6 Mon Sep 17 00:00:00 2001 From: Stefan Weigl-Bosker Date: Wed, 5 Mar 2025 21:33:35 -0500 Subject: [PATCH 002/107] pinentry-dmenu: init at 0.2.2 pinentry-dmenu: refactor to use finalAttrs pattern pinentry-dmenu: refactor pinentry-dmenu: init at 0.2.2 --- pkgs/by-name/pi/pinentry-dmenu/package.nix | 60 ++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 pkgs/by-name/pi/pinentry-dmenu/package.nix diff --git a/pkgs/by-name/pi/pinentry-dmenu/package.nix b/pkgs/by-name/pi/pinentry-dmenu/package.nix new file mode 100644 index 000000000000..1e7237d52d6f --- /dev/null +++ b/pkgs/by-name/pi/pinentry-dmenu/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fontconfig, + gpgme, + libX11, + libXinerama, + libXft, + pkg-config, + zlib, + writeText, + libassuan, + libconfig, + libgpg-error, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pinentry-dmenu"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "ritze"; + repo = "pinentry-dmenu"; + tag = finalAttrs.version; + hash = "sha256-FmP9tI/oU7VM8x+Wu6bbeg1CVopZc6oOWnd4qUptVV8="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + fontconfig + gpgme + libassuan + libconfig + libgpg-error + libX11 + libXinerama + libXft + ]; + + preConfigure = '' + makeFlagsArray+=( + PREFIX="$out" + CC="$CC" + # default config.mk hardcodes dependent libraries and include paths + INCS="`$PKG_CONFIG --cflags fontconfig x11 xft xinerama`" + LIBS="`$PKG_CONFIG --libs fontconfig x11 xft xinerama`" + ) + ''; + + meta = { + description = "Pinentry implementation based on dmenu"; + homepage = "https://github.com/ritze/pinentry-dmenu"; + changelog = "https://github.com/ritze/pinentry-dmenu/releases/tag/${finalAttrs.version}"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ sweiglbosker ]; + mainProgram = "pinentry-dmenu"; + platforms = lib.platforms.linux; + }; +}) From 841c9ff6652e22c2aaf81a8a42b6b93280f32590 Mon Sep 17 00:00:00 2001 From: NovaViper Date: Sun, 23 Feb 2025 18:48:04 -0600 Subject: [PATCH 003/107] qt: add "kde6" to qt.platformTheme Related issue: #260696 - Adds KDE Plasma 6 support, which fixes various issues with setting the QT platform theme on the desktop environment --- nixos/modules/config/qt.nix | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/nixos/modules/config/qt.nix b/nixos/modules/config/qt.nix index ee771698323e..d78d4f092b72 100644 --- a/nixos/modules/config/qt.nix +++ b/nixos/modules/config/qt.nix @@ -4,7 +4,6 @@ pkgs, ... }: - let cfg = config.qt; @@ -22,6 +21,11 @@ let libsForQt5.plasma-integration libsForQt5.systemsettings ]; + kde6 = [ + kdePackages.kio + kdePackages.plasma-integration + kdePackages.systemsettings + ]; lxqt = [ lxqt.lxqt-qtplugin lxqt.lxqt-config @@ -32,6 +36,11 @@ let ]; }; + # Maps style names to their QT_QPA_PLATFORMTHEME, if necessary. + styleNames = { + kde6 = "kde"; + }; + stylePackages = with pkgs; { bb10bright = [ libsForQt5.qtstyleplugins ]; bb10dark = [ libsForQt5.qtstyleplugins ]; @@ -61,7 +70,10 @@ let adwaita-qt6 ]; - breeze = [ libsForQt5.breeze-qt5 ]; + breeze = [ + libsForQt5.breeze-qt5 + kdePackages.breeze + ]; kvantum = [ libsForQt5.qtstyleplugin-kvantum @@ -115,6 +127,14 @@ in "libsForQt5" "systemsettings" ] + [ + "kdePackages" + "plasma-integration" + ] + [ + "kdePackages" + "systemsettings" + ] [ "lxqt" "lxqt-config" @@ -138,7 +158,8 @@ in The options are - `gnome`: Use GNOME theme with [qgnomeplatform](https://github.com/FedoraQt/QGnomePlatform) - `gtk2`: Use GTK theme with [qtstyleplugins](https://github.com/qt/qtstyleplugins) - - `kde`: Use Qt settings from Plasma. + - `kde`: Use Qt settings from Plasma 5. + - `kde6`: Use Qt settings from Plasma 6. - `lxqt`: Use LXQt style set using the [lxqt-config-appearance](https://github.com/lxqt/lxqt-config) application. - `qt5ct`: Use Qt style set using the [qt5ct](https://sourceforge.net/projects/qt5ct/) @@ -215,7 +236,9 @@ in ]; environment.variables = { - QT_QPA_PLATFORMTHEME = lib.mkIf (cfg.platformTheme != null) cfg.platformTheme; + QT_QPA_PLATFORMTHEME = + lib.mkIf (cfg.platformTheme != null) + styleNames.${cfg.platformTheme} or cfg.platformTheme; QT_STYLE_OVERRIDE = lib.mkIf (cfg.style != null) cfg.style; }; From 2f2a144f0ba057911fc7ef5f4dadc852a48b980d Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 16 Mar 2025 00:21:42 +0100 Subject: [PATCH 004/107] ayatana-indicator-messages: 24.5.0 -> 24.5.1 --- .../ayatana-indicator-messages/fix-pie.patch | 29 ------------------- .../ay/ayatana-indicator-messages/package.nix | 24 +++++++-------- 2 files changed, 11 insertions(+), 42 deletions(-) delete mode 100644 pkgs/by-name/ay/ayatana-indicator-messages/fix-pie.patch diff --git a/pkgs/by-name/ay/ayatana-indicator-messages/fix-pie.patch b/pkgs/by-name/ay/ayatana-indicator-messages/fix-pie.patch deleted file mode 100644 index 78dfcfe06458..000000000000 --- a/pkgs/by-name/ay/ayatana-indicator-messages/fix-pie.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 316457cf70dd105905d5d4925f43de280f08ab10 Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Sat, 11 Jan 2025 20:55:29 +0100 -Subject: [PATCH] tests/CMakeLists.txt: Drop hardcoded -no-pie linker flags - ---- - tests/CMakeLists.txt | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 63beacb..5b0812c 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -32,7 +32,6 @@ add_dependencies("indicator-messages-service" "ayatana-indicator-messages-servic - # test-gactionmuxer - - add_executable("test-gactionmuxer" test-gactionmuxer.cpp) --target_link_options("test-gactionmuxer" PRIVATE -no-pie) - target_include_directories("test-gactionmuxer" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS} "${CMAKE_SOURCE_DIR}/src") - target_link_libraries("test-gactionmuxer" "indicator-messages-service" ${PROJECT_DEPS_LIBRARIES} ${GTEST_LIBRARIES} ${GTEST_BOTH_LIBRARIES} ${GMOCK_LIBRARIES}) - add_test("test-gactionmuxer" "test-gactionmuxer") -@@ -59,7 +58,6 @@ add_custom_target("gschemas-compiled" ALL DEPENDS gschemas.compiled) - - pkg_check_modules(DBUSTEST REQUIRED dbustest-1) - add_executable("indicator-test" indicator-test.cpp) --target_link_options("indicator-test" PRIVATE -no-pie) - target_include_directories("indicator-test" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS} ${DBUSTEST_INCLUDE_DIRS} "${CMAKE_SOURCE_DIR}/libmessaging-menu") - target_link_libraries("indicator-test" "messaging-menu" ${PROJECT_DEPS_LIBRARIES} ${DBUSTEST_LIBRARIES} ${GTEST_LIBRARIES} ${GTEST_BOTH_LIBRARIES} ${GMOCK_LIBRARIES}) - target_compile_definitions( diff --git a/pkgs/by-name/ay/ayatana-indicator-messages/package.nix b/pkgs/by-name/ay/ayatana-indicator-messages/package.nix index d217e3c199bd..0ee00b0b3236 100644 --- a/pkgs/by-name/ay/ayatana-indicator-messages/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-messages/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ayatana-indicator-messages"; - version = "24.5.0"; + version = "24.5.1"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-indicator-messages"; tag = finalAttrs.version; - hash = "sha256-D1181eD2mAVXEa7RLXXC4b2tVGrxbh0WWgtbC1anHH0="; + hash = "sha256-M6IXI0ZnWPZod2ewxxfCeHhdYUrWDW/BFc1vMHmjObA="; }; outputs = [ @@ -40,16 +40,11 @@ stdenv.mkDerivation (finalAttrs: { "dev" ] ++ lib.optionals withDocumentation [ "devdoc" ]; - patches = [ - # Remove when https://github.com/AyatanaIndicators/ayatana-indicator-messages/pull/39 merged & in release - ./fix-pie.patch - ]; - postPatch = '' # Uses pkg_get_variable, cannot substitute prefix with that substituteInPlace data/CMakeLists.txt \ - --replace-fail "\''${SYSTEMD_USER_DIR}" "$out/lib/systemd/user" + --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})' # Bad concatenation substituteInPlace libmessaging-menu/messaging-menu.pc.in \ @@ -61,8 +56,8 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'GI_TYPELIB_PATH=\"' 'GI_TYPELIB_PATH=\"$GI_TYPELIB_PATH$\{GI_TYPELIB_PATH\:+\:\}' '' + lib.optionalString (!withDocumentation) '' - sed -i CMakeLists.txt \ - '/add_subdirectory(doc)/d' + substituteInPlace CMakeLists.txt \ + --replace-fail 'add_subdirectory(doc)' '# add_subdirectory(doc)' ''; strictDeps = true; @@ -105,9 +100,9 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DENABLE_TESTS=${lib.boolToString finalAttrs.finalPackage.doCheck}" - "-DGSETTINGS_LOCALINSTALL=ON" - "-DGSETTINGS_COMPILE=ON" + (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) + (lib.cmakeBool "GSETTINGS_LOCALINSTALL" true) + (lib.cmakeBool "GSETTINGS_COMPILE" true) ]; makeFlags = lib.optionals withDocumentation [ @@ -163,6 +158,9 @@ stdenv.mkDerivation (finalAttrs: { others, e.g. XFCE, LXDE). ''; homepage = "https://github.com/AyatanaIndicators/ayatana-indicator-messages"; + changelog = "https://github.com/AyatanaIndicators/ayatana-indicator-messages/blob/${ + if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev + }/ChangeLog"; license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ OPNA2608 ]; From 0c3944320adec9dc23432de40f75241f843594e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Mar 2025 16:41:58 +0000 Subject: [PATCH 005/107] gearlever: 2.3.2 -> 3.0.2 --- pkgs/by-name/ge/gearlever/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ge/gearlever/package.nix b/pkgs/by-name/ge/gearlever/package.nix index 83f1765d671a..427c2cc28e13 100644 --- a/pkgs/by-name/ge/gearlever/package.nix +++ b/pkgs/by-name/ge/gearlever/package.nix @@ -21,14 +21,14 @@ python3Packages.buildPythonApplication rec { pname = "gearlever"; - version = "2.3.2"; + version = "3.0.2"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "mijorus"; repo = "gearlever"; tag = version; - hash = "sha256-w+tCOMDNm99cAtA9AmADBc6dP4y5KDDP8iiRZS+5upQ="; + hash = "sha256-b5CH7qJKsXwARCIv4EiwGcc3nH/GKGkb8gwxPWYAr4s="; }; postPatch = From 01cee7e80ec9114a077a1c5e99b0e75528b2690c Mon Sep 17 00:00:00 2001 From: heisfer Date: Tue, 18 Mar 2025 10:49:33 +0200 Subject: [PATCH 006/107] go-grip: init at 0.5.6 --- pkgs/by-name/go/go-grip/package.nix | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 pkgs/by-name/go/go-grip/package.nix diff --git a/pkgs/by-name/go/go-grip/package.nix b/pkgs/by-name/go/go-grip/package.nix new file mode 100644 index 000000000000..a7c5b6660b09 --- /dev/null +++ b/pkgs/by-name/go/go-grip/package.nix @@ -0,0 +1,29 @@ +{ + buildGoModule, + fetchFromGitHub, + lib, + gitUpdater, +}: +buildGoModule rec { + pname = "go-grip"; + version = "0.5.6"; + + src = fetchFromGitHub { + owner = "chrishrb"; + repo = "go-grip"; + tag = "v${version}"; + hash = "sha256-c3tl5nALPqIAMSqjbbQDi6mN6M1mKJvzxxDHcj/QyuY="; + }; + + vendorHash = "sha256-aU6vo/uqJzctD7Q8HPFzHXVVJwMmlzQXhAA6LSkRAow="; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = { + description = "Preview Markdown files locally before committing them"; + homepage = "https://github.com/chrishrb/go-grip"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ heisfer ]; + mainProgram = "go-grip"; + }; +} From de76a1e8524a2ace49db66776fdfae16bcf80108 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 22 Mar 2025 13:55:56 +0100 Subject: [PATCH 007/107] nixosTests.miriway: Migrate to runTest --- nixos/tests/all-tests.nix | 2 +- nixos/tests/miriway.nix | 258 +++++++++++++++++++------------------- 2 files changed, 129 insertions(+), 131 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 2884fdc09d32..e2864ac0457c 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -706,7 +706,7 @@ in { miniflux = handleTest ./miniflux.nix {}; minio = handleTest ./minio.nix {}; miracle-wm = runTest ./miracle-wm.nix; - miriway = handleTest ./miriway.nix {}; + miriway = runTest ./miriway.nix; misc = handleTest ./misc.nix {}; misskey = handleTest ./misskey.nix {}; mjolnir = handleTest ./matrix/mjolnir.nix {}; diff --git a/nixos/tests/miriway.nix b/nixos/tests/miriway.nix index 012def1c4510..0835fa5dc89b 100644 --- a/nixos/tests/miriway.nix +++ b/nixos/tests/miriway.nix @@ -1,148 +1,146 @@ -import ./make-test-python.nix ( - { pkgs, lib, ... }: - { - name = "miriway"; +{ pkgs, lib, ... }: +{ + name = "miriway"; - meta = { - maintainers = with lib.maintainers; [ OPNA2608 ]; - }; + meta = { + maintainers = with lib.maintainers; [ OPNA2608 ]; + }; - nodes.machine = - { config, ... }: - { - imports = [ - ./common/auto.nix - ./common/user-account.nix - ]; + nodes.machine = + { config, ... }: + { + imports = [ + ./common/auto.nix + ./common/user-account.nix + ]; - # Seems to very rarely get interrupted by oom-killer - virtualisation.memorySize = 2047; + # Seems to very rarely get interrupted by oom-killer + virtualisation.memorySize = 2047; - test-support.displayManager.auto = { - enable = true; - user = "alice"; - }; - - programs.ydotool.enable = true; - - services.xserver.enable = true; - services.displayManager.defaultSession = lib.mkForce "miriway"; - - programs.miriway = { - enable = true; - config = '' - add-wayland-extensions=all - enable-x11= - - ctrl-alt=t:foot --maximized - ctrl-alt=a:env WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY= alacritty --option window.startup_mode=\"maximized\" - - shell-component=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY - - shell-component=foot --maximized - ''; - }; - - environment = { - shellAliases = { - test-wayland = "wayland-info | tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok"; - test-x11 = "glinfo | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok"; - }; - - systemPackages = with pkgs; [ - mesa-demos - wayland-utils - foot - alacritty - ]; - - # To help with OCR - etc."xdg/foot/foot.ini".source = (pkgs.formats.ini { }).generate "foot.ini" { - main = { - font = "inconsolata:size=16"; - }; - colors = rec { - foreground = "000000"; - background = "ffffff"; - regular2 = foreground; - }; - }; - etc."xdg/alacritty/alacritty.toml".source = (pkgs.formats.toml { }).generate "alacritty.toml" { - font = rec { - normal.family = "Inconsolata"; - bold.family = normal.family; - italic.family = normal.family; - bold_italic.family = normal.family; - size = 16; - }; - colors = rec { - primary = { - foreground = "0x000000"; - background = "0xffffff"; - }; - normal = { - green = primary.foreground; - }; - }; - }; - }; - - fonts.packages = [ pkgs.inconsolata ]; + test-support.displayManager.auto = { + enable = true; + user = "alice"; }; - enableOCR = true; + programs.ydotool.enable = true; - testScript = - { nodes, ... }: - '' - start_all() - machine.wait_for_unit("multi-user.target") + services.xserver.enable = true; + services.displayManager.defaultSession = lib.mkForce "miriway"; - # Wait for Miriway to complete startup - machine.wait_for_file("/run/user/1000/wayland-0") - machine.succeed("pgrep miriway-shell") - machine.screenshot("miriway_launched") + programs.miriway = { + enable = true; + config = '' + add-wayland-extensions=all + enable-x11= - # Test Wayland - # We let Miriway start the first terminal, as we might get stuck if it's not ready to process the first keybind - # machine.send_key("ctrl-alt-t") - machine.wait_for_text(r"(alice|machine)") - machine.send_chars("test-wayland\n") - machine.wait_for_file("/tmp/test-wayland-exit-ok") - machine.copy_from_vm("/tmp/test-wayland.out") - machine.screenshot("foot_wayland_info") + ctrl-alt=t:foot --maximized + ctrl-alt=a:env WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY= alacritty --option window.startup_mode=\"maximized\" - # please actually register that we want to close the window - machine.succeed("ydotool mousemove -- 10 10") - machine.sleep(3) + shell-component=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY - machine.send_chars("exit\n") + shell-component=foot --maximized + ''; + }; - # please actually register that we want to close the window - machine.succeed("ydotool mousemove -- 10 10") - machine.sleep(3) + environment = { + shellAliases = { + test-wayland = "wayland-info | tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok"; + test-x11 = "glinfo | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok"; + }; - machine.wait_until_fails("pgrep foot") + systemPackages = with pkgs; [ + mesa-demos + wayland-utils + foot + alacritty + ]; - # Test XWayland - machine.send_key("ctrl-alt-a") - machine.wait_for_text(r"(alice|machine)") - machine.send_chars("test-x11\n") - machine.wait_for_file("/tmp/test-x11-exit-ok") - machine.copy_from_vm("/tmp/test-x11.out") - machine.screenshot("alacritty_glinfo") + # To help with OCR + etc."xdg/foot/foot.ini".source = (pkgs.formats.ini { }).generate "foot.ini" { + main = { + font = "inconsolata:size=16"; + }; + colors = rec { + foreground = "000000"; + background = "ffffff"; + regular2 = foreground; + }; + }; + etc."xdg/alacritty/alacritty.toml".source = (pkgs.formats.toml { }).generate "alacritty.toml" { + font = rec { + normal.family = "Inconsolata"; + bold.family = normal.family; + italic.family = normal.family; + bold_italic.family = normal.family; + size = 16; + }; + colors = rec { + primary = { + foreground = "0x000000"; + background = "0xffffff"; + }; + normal = { + green = primary.foreground; + }; + }; + }; + }; - # please actually register that we want to close the window - machine.succeed("ydotool mousemove -- 10 10") - machine.sleep(3) + fonts.packages = [ pkgs.inconsolata ]; + }; - machine.send_chars("exit\n") + enableOCR = true; - # please actually register that we want to close the window - machine.succeed("ydotool mousemove -- 10 10") - machine.sleep(3) + testScript = + { nodes, ... }: + '' + start_all() + machine.wait_for_unit("multi-user.target") - machine.wait_until_fails("pgrep alacritty") - ''; - } -) + # Wait for Miriway to complete startup + machine.wait_for_file("/run/user/1000/wayland-0") + machine.succeed("pgrep miriway-shell") + machine.screenshot("miriway_launched") + + # Test Wayland + # We let Miriway start the first terminal, as we might get stuck if it's not ready to process the first keybind + # machine.send_key("ctrl-alt-t") + machine.wait_for_text(r"(alice|machine)") + machine.send_chars("test-wayland\n") + machine.wait_for_file("/tmp/test-wayland-exit-ok") + machine.copy_from_vm("/tmp/test-wayland.out") + machine.screenshot("foot_wayland_info") + + # please actually register that we want to close the window + machine.succeed("ydotool mousemove -- 10 10") + machine.sleep(3) + + machine.send_chars("exit\n") + + # please actually register that we want to close the window + machine.succeed("ydotool mousemove -- 10 10") + machine.sleep(3) + + machine.wait_until_fails("pgrep foot") + + # Test XWayland + machine.send_key("ctrl-alt-a") + machine.wait_for_text(r"(alice|machine)") + machine.send_chars("test-x11\n") + machine.wait_for_file("/tmp/test-x11-exit-ok") + machine.copy_from_vm("/tmp/test-x11.out") + machine.screenshot("alacritty_glinfo") + + # please actually register that we want to close the window + machine.succeed("ydotool mousemove -- 10 10") + machine.sleep(3) + + machine.send_chars("exit\n") + + # please actually register that we want to close the window + machine.succeed("ydotool mousemove -- 10 10") + machine.sleep(3) + + machine.wait_until_fails("pgrep alacritty") + ''; +} From 5d371953decf919356ef36edf54ea3edaf4c67ae Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 22 Mar 2025 13:57:56 +0100 Subject: [PATCH 008/107] nixosTests.morph-browser: Migrate to runTest --- nixos/tests/all-tests.nix | 2 +- nixos/tests/morph-browser.nix | 92 +++++++++++++++++------------------ 2 files changed, 46 insertions(+), 48 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e2864ac0457c..ff53efd6f0ba 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -725,7 +725,7 @@ in { moodle = handleTest ./moodle.nix {}; moonraker = handleTest ./moonraker.nix {}; mopidy = handleTest ./mopidy.nix {}; - morph-browser = handleTest ./morph-browser.nix { }; + morph-browser = runTest ./morph-browser.nix; morty = handleTest ./morty.nix {}; mosquitto = handleTest ./mosquitto.nix {}; moosefs = handleTest ./moosefs.nix {}; diff --git a/nixos/tests/morph-browser.nix b/nixos/tests/morph-browser.nix index ec526e31c3c3..d75b3444be5a 100644 --- a/nixos/tests/morph-browser.nix +++ b/nixos/tests/morph-browser.nix @@ -1,57 +1,55 @@ -import ./make-test-python.nix ( - { pkgs, lib, ... }: - { - name = "morph-browser-standalone"; - meta.maintainers = lib.teams.lomiri.members; +{ pkgs, lib, ... }: +{ + name = "morph-browser-standalone"; + meta.maintainers = lib.teams.lomiri.members; - nodes.machine = - { config, pkgs, ... }: - { - imports = [ - ./common/x11.nix + nodes.machine = + { config, pkgs, ... }: + { + imports = [ + ./common/x11.nix + ]; + + services.xserver.enable = true; + + environment = { + systemPackages = with pkgs.lomiri; [ + suru-icon-theme + morph-browser ]; - - services.xserver.enable = true; - - environment = { - systemPackages = with pkgs.lomiri; [ - suru-icon-theme - morph-browser - ]; - variables = { - UITK_ICON_THEME = "suru"; - }; + variables = { + UITK_ICON_THEME = "suru"; }; - - i18n.supportedLocales = [ "all" ]; - - fonts.packages = with pkgs; [ - # Intended font & helps with OCR - ubuntu-classic - ]; }; - enableOCR = true; + i18n.supportedLocales = [ "all" ]; - testScript = '' - machine.wait_for_x() + fonts.packages = with pkgs; [ + # Intended font & helps with OCR + ubuntu-classic + ]; + }; - with subtest("morph browser launches"): - machine.execute("morph-browser >&2 &") - machine.wait_for_text(r"Web Browser|New|sites|Bookmarks") - machine.screenshot("morph_open") + enableOCR = true; - with subtest("morph browser displays HTML"): - machine.send_chars("file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html\n") - machine.wait_for_text("Valgrind Documentation") - machine.screenshot("morph_htmlcontent") + testScript = '' + machine.wait_for_x() - machine.succeed("pkill -f morph-browser") + with subtest("morph browser launches"): + machine.execute("morph-browser >&2 &") + machine.wait_for_text(r"Web Browser|New|sites|Bookmarks") + machine.screenshot("morph_open") - with subtest("morph browser localisation works"): - machine.execute("env LANG=de_DE.UTF-8 morph-browser >&2 &") - machine.wait_for_text(r"Web-Browser|Neuer|Seiten|Lesezeichen") - machine.screenshot("morph_localised") - ''; - } -) + with subtest("morph browser displays HTML"): + machine.send_chars("file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html\n") + machine.wait_for_text("Valgrind Documentation") + machine.screenshot("morph_htmlcontent") + + machine.succeed("pkill -f morph-browser") + + with subtest("morph browser localisation works"): + machine.execute("env LANG=de_DE.UTF-8 morph-browser >&2 &") + machine.wait_for_text(r"Web-Browser|Neuer|Seiten|Lesezeichen") + machine.screenshot("morph_localised") + ''; +} From a210b5eca3b8ac9567f44aca810e5acf7fde579f Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 22 Mar 2025 16:00:13 +0100 Subject: [PATCH 009/107] ayatana-indicator-display: 24.5.0 -> 24.5.1 --- pkgs/by-name/ay/ayatana-indicator-display/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ay/ayatana-indicator-display/package.nix b/pkgs/by-name/ay/ayatana-indicator-display/package.nix index 2bc786818554..04373cd3a2aa 100644 --- a/pkgs/by-name/ay/ayatana-indicator-display/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-display/package.nix @@ -17,6 +17,7 @@ libgudev, libqtdbusmock, libqtdbustest, + librda, libsForQt5, lomiri, mate, @@ -30,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ayatana-indicator-display"; - version = "24.5.0"; + version = "24.5.1"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-indicator-display"; tag = finalAttrs.version; - hash = "sha256-ZEmJJtVK1dHIrY0C6pqVu1N5PmQtYqX0K5v5LvzNfFA="; + hash = "sha256-vvDgJVFrgtjAzDXXas19osDydS+C3brZOctXIIWrkyM="; }; postPatch = '' @@ -69,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: { glib libayatana-common libgudev + librda libsForQt5.qtbase systemd ] From e1b123c3043da984e1082233b6db005742599590 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 23 Mar 2025 02:48:39 +0100 Subject: [PATCH 010/107] miracle-wm: 0.4.1 -> 0.5.1 --- pkgs/by-name/mi/miracle-wm/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix index 2a44b0bf8962..2ffbc30cc5f0 100644 --- a/pkgs/by-name/mi/miracle-wm/package.nix +++ b/pkgs/by-name/mi/miracle-wm/package.nix @@ -30,19 +30,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "miracle-wm"; - version = "0.4.1"; + version = "0.5.1"; src = fetchFromGitHub { owner = "miracle-wm-org"; repo = "miracle-wm"; tag = "v${finalAttrs.version}"; - hash = "sha256-LPcVLpskpmHc8EzdNqMT6BnbY8Le/BVojpXPIqy6tGI="; + hash = "sha256-PCY6vAnDjyoIL66oREUGRypQFX90EKB1RlXTkQDyXMw="; }; postPatch = '' substituteInPlace CMakeLists.txt \ - --replace-fail 'DESTINATION /usr/lib' 'DESTINATION ''${CMAKE_INSTALL_LIBDIR}' + --replace-fail 'DESTINATION /usr/lib' 'DESTINATION ''${CMAKE_INSTALL_LIBDIR}' \ + --replace-fail '-march=native' '# -march=native' \ + --replace-fail '-flto' '# -flto' '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' substituteInPlace CMakeLists.txt \ From db6874713affebd5a7a0e932b05c9c8453c97985 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 24 Mar 2025 11:13:42 +0100 Subject: [PATCH 011/107] crocoddyl: 3.0.0 -> 3.0.1 Diff: https://github.com/loco-3d/crocoddyl/compare/refs/tags/v3.0.0...v3.0.1 --- pkgs/by-name/cr/crocoddyl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cr/crocoddyl/package.nix b/pkgs/by-name/cr/crocoddyl/package.nix index f4cab7ae2ba3..efa08423defd 100644 --- a/pkgs/by-name/cr/crocoddyl/package.nix +++ b/pkgs/by-name/cr/crocoddyl/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "crocoddyl"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "loco-3d"; repo = "crocoddyl"; - rev = "v${finalAttrs.version}"; - hash = "sha256-oWcclzzuswiR1SaQJd6GnMltJ2vgt7AgJPT0FJzD1Gs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-eUH9fMhuIUp5kuDKNo4B8iJ3JlMIqv7wX6meOpyPTJk="; }; outputs = [ From d2be7570107f52e3df69d4821431a3b9f0d09e93 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Fri, 21 Mar 2025 13:42:52 +0100 Subject: [PATCH 012/107] crocoddyl: clean --- pkgs/by-name/cr/crocoddyl/package.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/cr/crocoddyl/package.nix b/pkgs/by-name/cr/crocoddyl/package.nix index efa08423defd..78ddc5abfa55 100644 --- a/pkgs/by-name/cr/crocoddyl/package.nix +++ b/pkgs/by-name/cr/crocoddyl/package.nix @@ -59,17 +59,11 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.scipy ]; - cmakeFlags = - [ - (lib.cmakeBool "INSTALL_DOCUMENTATION" true) - (lib.cmakeBool "BUILD_EXAMPLES" pythonSupport) - (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # ref. https://github.com/stack-of-tasks/pinocchio/issues/2563 - # remove this for crocoddyl >= 3.0.0 - (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;test_pybinds_*") - ]; + cmakeFlags = [ + (lib.cmakeBool "INSTALL_DOCUMENTATION" true) + (lib.cmakeBool "BUILD_EXAMPLES" pythonSupport) + (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) + ]; prePatch = '' substituteInPlace \ From 2bb7f46e4b2a188bf93a5cc2e996c20c8e753653 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 18 Mar 2025 11:41:23 +0100 Subject: [PATCH 013/107] aligator: 0.8.0 -> 0.11.0 Diff: https://github.com/Simple-Robotics/aligator/compare/v0.8.0...v0.11.0 Changelog: https://github.com/Simple-Robotics/aligator/blob/v0.11.0/CHANGELOG.md --- pkgs/by-name/al/aligator/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/al/aligator/package.nix b/pkgs/by-name/al/aligator/package.nix index e7cb03a8771e..d38ac7e2d9ff 100644 --- a/pkgs/by-name/al/aligator/package.nix +++ b/pkgs/by-name/al/aligator/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "aligator"; - version = "0.8.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "Simple-Robotics"; repo = "aligator"; - rev = "v${finalAttrs.version}"; - hash = "sha256-o4QjxTaZUa17hZsCv4hCI2cedaHoojBtLe8SVUkl0bo="; + tag = "v${finalAttrs.version}"; + hash = "sha256-w6oYy7lg1uGEp+yfvjQ644kqfFp1u9VdrJl0GkyptUs="; }; outputs = [ From cfb5aba5208d8174b8f377f9cd6175d07525deca Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 18 Mar 2025 11:30:28 +0100 Subject: [PATCH 014/107] aligator: silence MPL warnings --- pkgs/by-name/al/aligator/package.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/aligator/package.nix b/pkgs/by-name/al/aligator/package.nix index d38ac7e2d9ff..f3763e02859e 100644 --- a/pkgs/by-name/al/aligator/package.nix +++ b/pkgs/by-name/al/aligator/package.nix @@ -80,8 +80,13 @@ stdenv.mkDerivation (finalAttrs: { # Fontconfig error: Cannot load default config file: No such file: (null) env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; - # Fontconfig error: No writable cache directories - preBuild = "export XDG_CACHE_HOME=$(mktemp -d)"; + preBuild = '' + # silence matplotlib warning + export MPLCONFIGDIR=$(mktemp -d) + + # Fontconfig error: No writable cache directories + export XDG_CACHE_HOME=$(mktemp -d) + ''; doCheck = true; pythonImportsCheck = [ "aligator" ]; From be2e9ac6b2439ee145d993d118fd44ef565177b4 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Fri, 21 Mar 2025 13:44:54 +0100 Subject: [PATCH 015/107] aligator: clean --- pkgs/by-name/al/aligator/package.nix | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/al/aligator/package.nix b/pkgs/by-name/al/aligator/package.nix index f3763e02859e..228416db146d 100644 --- a/pkgs/by-name/al/aligator/package.nix +++ b/pkgs/by-name/al/aligator/package.nix @@ -8,7 +8,7 @@ gbenchmark, graphviz, lib, - llvmPackages, # llvm/Support/Host.h required by casadi 3.6.5 and not available in llvm 18 + llvmPackages, pinocchio, pkg-config, proxsuite-nlp, @@ -36,13 +36,21 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ - doxygen - cmake - graphviz - pkg-config - ] ++ lib.optional pythonSupport python3Packages.pythonImportsCheckHook; - buildInputs = [ fmt ] ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp; + nativeBuildInputs = + [ + doxygen + cmake + graphviz + pkg-config + ] + ++ lib.optionals pythonSupport [ + python3Packages.pythonImportsCheckHook + ]; + buildInputs = + [ fmt ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + llvmPackages.openmp + ]; propagatedBuildInputs = [ suitesparse ] ++ lib.optionals pythonSupport [ @@ -74,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && pythonSupport) [ # ignore one failing test for now - (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;aligator-test-py-integrators") + (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;aligator-test-py-rollout") ]; # Fontconfig error: Cannot load default config file: No such file: (null) From 6d0969e84d07d4b124abe52205522fba00919fb7 Mon Sep 17 00:00:00 2001 From: Stefano De Vuono Date: Thu, 27 Feb 2025 15:05:29 -0800 Subject: [PATCH 016/107] xeus: 3.2.0 -> 5.2.0 (#385730) use finalAttrs prefix for repo and tag add nix-update-script with lib.maintainers and include nix-update-script pin old ver of xeus for xeus-cling and xeus-zmq add xeus_3_2_0 var to cling and zmq fix typos fix version var rm vars for version address PR feedback change "version" to "tag" in the fetchFromGitHub call in xeus-cling add xlt to the buildInputs in xeus-cling use just `xeus` in the buildInputs in xeus-zmq link to the issue in xeus-cling that explains the need for the 3.2.0 version of xeus change xlt to xtl --- .../jupyter-kernels/xeus-cling/xeus-cling.nix | 17 ++++++++++++- pkgs/by-name/xe/xeus-zmq/package.nix | 15 ++++++++++++ pkgs/by-name/xe/xeus/package.nix | 24 ++++++++++--------- 3 files changed, 44 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix b/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix index fd88db33bcc4..9202704a3555 100644 --- a/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix +++ b/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix @@ -34,6 +34,21 @@ let }; }); + # Nixpkgs moved to xeus 5.2.0, but we need 3.2.0 + # https://github.com/jupyter-xeus/xeus-cling/issues/523 + xeus_3_2_0 = xeus.overrideAttrs (oldAttrs: { + version = "3.2.0"; + + src = fetchFromGitHub { + owner = "jupyter-xeus"; + repo = "xeus"; + tag = "3.2.0"; + sha256 = "sha256-D/dJ0SHxTHJw63gHD6FRZS7O2TVZ0voIv2mQASEjLA8="; + }; + + buildInputs = oldAttrs.buildInputs ++ lib.singleton xtl; + }); + in clangStdenv.mkDerivation rec { @@ -62,7 +77,7 @@ clangStdenv.mkDerivation rec { ncurses openssl pugixml - xeus + xeus_3_2_0 xeus-zmq xtl zeromq diff --git a/pkgs/by-name/xe/xeus-zmq/package.nix b/pkgs/by-name/xe/xeus-zmq/package.nix index ae4374163458..205d987ac317 100644 --- a/pkgs/by-name/xe/xeus-zmq/package.nix +++ b/pkgs/by-name/xe/xeus-zmq/package.nix @@ -12,6 +12,21 @@ zeromq, }: +let + # Nixpkgs moved to xeus 5.2.0, but we need 3.2.0 + xeus_3_2_0 = xeus.overrideAttrs (oldAttrs: { + version = "3.2.0"; + + src = fetchFromGitHub { + owner = "jupyter-xeus"; + repo = "xeus"; + version = "3.2.0"; + sha256 = "sha256-D/dJ0SHxTHJw63gHD6FRZS7O2TVZ0voIv2mQASEjLA8="; + }; + }); + +in + clangStdenv.mkDerivation rec { pname = "xeus-zmq"; version = "1.3.0"; diff --git a/pkgs/by-name/xe/xeus/package.nix b/pkgs/by-name/xe/xeus/package.nix index 1ec1526bb14f..b0229d7b8f00 100644 --- a/pkgs/by-name/xe/xeus/package.nix +++ b/pkgs/by-name/xe/xeus/package.nix @@ -6,18 +6,19 @@ doctest, nlohmann_json, libuuid, + nix-update-script, xtl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xeus"; - version = "3.2.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "jupyter-xeus"; - repo = "xeus"; - rev = version; - sha256 = "sha256-D/dJ0SHxTHJw63gHD6FRZS7O2TVZ0voIv2mQASEjLA8="; + repo = finalAttrs.pname; + tag = finalAttrs.version; + hash = "sha256-/4SVrfPU5pkO3PNrhgdCcNUts++Or7AeMqO/PorsBdw="; }; nativeBuildInputs = [ @@ -28,7 +29,6 @@ stdenv.mkDerivation rec { buildInputs = [ nlohmann_json libuuid - xtl ]; cmakeFlags = [ @@ -38,11 +38,13 @@ stdenv.mkDerivation rec { doCheck = true; preCheck = ''export LD_LIBRARY_PATH=$PWD''; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { homepage = "https://xeus.readthedocs.io"; description = "C++ implementation of the Jupyter Kernel protocol"; - license = licenses.bsd3; - maintainers = with maintainers; [ serge_sans_paille ]; - platforms = platforms.all; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ serge_sans_paille ]; + platforms = lib.platforms.all; }; -} +}) From e8598f846c64edffebb995a090720124da95361b Mon Sep 17 00:00:00 2001 From: Stefano De Vuono Date: Mon, 24 Mar 2025 15:20:02 -0700 Subject: [PATCH 017/107] remove xeus-zmq reference to xeus 3.2.0 --- pkgs/by-name/xe/xeus-zmq/package.nix | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pkgs/by-name/xe/xeus-zmq/package.nix b/pkgs/by-name/xe/xeus-zmq/package.nix index 205d987ac317..ae4374163458 100644 --- a/pkgs/by-name/xe/xeus-zmq/package.nix +++ b/pkgs/by-name/xe/xeus-zmq/package.nix @@ -12,21 +12,6 @@ zeromq, }: -let - # Nixpkgs moved to xeus 5.2.0, but we need 3.2.0 - xeus_3_2_0 = xeus.overrideAttrs (oldAttrs: { - version = "3.2.0"; - - src = fetchFromGitHub { - owner = "jupyter-xeus"; - repo = "xeus"; - version = "3.2.0"; - sha256 = "sha256-D/dJ0SHxTHJw63gHD6FRZS7O2TVZ0voIv2mQASEjLA8="; - }; - }); - -in - clangStdenv.mkDerivation rec { pname = "xeus-zmq"; version = "1.3.0"; From d92003b5c8762861816a551a30a64d1586403596 Mon Sep 17 00:00:00 2001 From: Qiming Chu Date: Tue, 25 Mar 2025 16:23:31 +0800 Subject: [PATCH 018/107] klayout: fix darwin build Signed-off-by: Qiming Chu --- pkgs/applications/misc/klayout/default.nix | 46 +++++++++++++++++----- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 8c045da4e3fd..c7815d0fc81c 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -1,6 +1,17 @@ -{ lib, mkDerivation, fetchFromGitHub -, python3, ruby, qtbase, qtmultimedia, qttools, qtxmlpatterns -, which, perl, libgit2 +{ + lib, + mkDerivation, + fetchFromGitHub, + python3, + ruby, + qtbase, + qtmultimedia, + qttools, + qtxmlpatterns, + which, + perl, + libgit2, + stdenv, }: mkDerivation rec { @@ -41,12 +52,28 @@ mkDerivation rec { runHook postBuild ''; - postBuild = '' - mkdir $out/bin - mv $out/lib/klayout $out/bin/ + postBuild = + lib.optionalString stdenv.hostPlatform.isLinux '' + mkdir $out/bin - install -Dm444 etc/klayout.desktop -t $out/share/applications - install -Dm444 etc/logo.png $out/share/icons/hicolor/256x256/apps/klayout.png + install -Dm444 etc/klayout.desktop -t $out/share/applications + install -Dm444 etc/logo.png $out/share/icons/hicolor/256x256/apps/klayout.png + mv $out/lib/klayout $out/bin/ + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications + mv $out/lib/klayout.app $out/Applications/ + ''; + + preFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + exec_name=$out/Applications/klayout.app/Contents/MacOS/klayout + + for lib in $out/lib/libklayout_*.0.dylib; do + base_name=$(basename $lib) + install_name_tool -change "$base_name" "@rpath/$base_name" "$exec_name" + done + + wrapQtApp "$out/Applications/klayout.app/Contents/MacOS/klayout" ''; env.NIX_CFLAGS_COMPILE = toString [ "-Wno-parentheses" ]; @@ -63,8 +90,7 @@ mkDerivation rec { license = with licenses; [ gpl2Plus ]; homepage = "https://www.klayout.de/"; changelog = "https://www.klayout.de/development.html#${version}"; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ]; }; } - From e0f8ea6cf74f64db3f44a96e06ffca2186df84c7 Mon Sep 17 00:00:00 2001 From: misilelab Date: Wed, 26 Mar 2025 00:59:14 +0900 Subject: [PATCH 019/107] bun: 1.2.5 -> 1.2.7 https://bun.sh/blog/bun-v1.2.6 https://bun.sh/blog/bun-v1.2.7 Signed-off-by: misilelab --- pkgs/by-name/bu/bun/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix index a9d311ee4641..916df8a8a8fc 100644 --- a/pkgs/by-name/bu/bun/package.nix +++ b/pkgs/by-name/bu/bun/package.nix @@ -16,7 +16,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.2.5"; + version = "1.2.7"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -76,19 +76,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-VeZSChcuIqN9SCLyOv3pCybzaIDOPqrTSGmUGNv3iLs="; + hash = "sha256-VxB20tZEoKSWchHphR9YTESmRcCgt7tRma/xIXL9WuQ="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-7htcq7X9uyVkB4fjKYRu9BOEyoaZ21BPRb/uAV80i1g="; + hash = "sha256-nCS4Oky54tHiH8cdHNj4nz1vd3bqeR1CusjgPku1MZs="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip"; - hash = "sha256-P/MaERH0ww2O8a2Xk74ziNAp5aEZ8JiP5PCltNSTB1M="; + hash = "sha256-C8LjwcdW/1H6NfzsJ0+X+xRzfYFNihzne8ePJGk1etE="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-iPZL7e4zD/TWMo4+kMZpvHrFMUknxgT4XjKeoqHRl5s="; + hash = "sha256-hHsTjLGOq4Inyx87Fu3Kuvdk5Yp5pef5BeunaOo138s="; }; }; updateScript = writeShellScript "update-bun" '' From b7569d37690e0c77d5ef2d03d65c53cda940d5f9 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 27 Mar 2025 17:55:21 +0100 Subject: [PATCH 020/107] aligator: 0.11.0 -> 0.12.0 Diff: https://github.com/Simple-Robotics/aligator/compare/refs/tags/v0.11.0...v0.12.0 Changelog: https://github.com/Simple-Robotics/aligator/blob/v0.12.0/CHANGELOG.md --- pkgs/by-name/al/aligator/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/aligator/package.nix b/pkgs/by-name/al/aligator/package.nix index 228416db146d..6b80cc99aac9 100644 --- a/pkgs/by-name/al/aligator/package.nix +++ b/pkgs/by-name/al/aligator/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "aligator"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "Simple-Robotics"; repo = "aligator"; tag = "v${finalAttrs.version}"; - hash = "sha256-w6oYy7lg1uGEp+yfvjQ644kqfFp1u9VdrJl0GkyptUs="; + hash = "sha256-oy2qcJbIGr5pe+XYWKntfsc6Ie7oEU1qqrPXjuqULmY="; }; outputs = [ From ac2a5fa8f51f9a28277de050512ad926ca3a6f82 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 28 Mar 2025 10:35:37 +0100 Subject: [PATCH 021/107] grafana: 11.5.2 -> 11.6.0 Closes #393713 ChangeLog: https://github.com/grafana/grafana/releases/tag/v11.6.0 --- pkgs/servers/monitoring/grafana/default.nix | 29 +++++++++++++++------ 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index b758497bb98b..1b30c6ead78f 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -22,16 +22,29 @@ let # Grafana seems to just set it to the latest version available # nowadays. + # NOTE: sometimes, this is a no-op (i.e. `--replace-fail "X" "X"`). + # This is because Grafana raises the Go version above the patch-level we have + # on master if a security fix landed in Go (and our go may go through staging first). + # + # I(Ma27) decided to leave the code a no-op if this is not the case because + # pulling it out of the Git history every few months and checking which files + # we need to update now is slightly annoying. patchGoVersion = '' - substituteInPlace go.{mod,work} apps/alerting/notifications/go.mod pkg/storage/unified/apistore/go.mod pkg/storage/unified/resource/go.mod \ - --replace-fail "go 1.23.5" "go 1.23.4" + find . -name go.mod -not -path "./.bingo/*" -print0 | while IFS= read -r -d ''' line; do + substituteInPlace "$line" \ + --replace-fail "go 1.23.7" "go 1.23.7" + done + find . -name go.work -print0 | while IFS= read -r -d ''' line; do + substituteInPlace "$line" \ + --replace-fail "go 1.23.7" "go 1.23.7" + done substituteInPlace Makefile \ - --replace-fail "GO_VERSION = 1.23.5" "GO_VERSION = 1.23.4" + --replace-fail "GO_VERSION = 1.23.7" "GO_VERSION = 1.23.7" ''; in buildGoModule rec { pname = "grafana"; - version = "11.5.2"; + version = "11.6.0"; subPackages = [ "pkg/cmd/grafana" @@ -43,7 +56,7 @@ buildGoModule rec { owner = "grafana"; repo = "grafana"; rev = "v${version}"; - hash = "sha256-W0wn19SqqzxHm2fRtsEOru4khNqZziAfzWWc6H+Juew="; + hash = "sha256-oXotHi79XBhxD/qYC7QDQwn7jiX0wKWe/RXZS5DwN9o="; }; # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22 @@ -81,9 +94,9 @@ buildGoModule rec { outputHashMode = "recursive"; outputHash = rec { - x86_64-linux = "sha256-8KoSBzcEih9UKOkbcNTN1pZz/wVTedJ8qLRe+uXV/dE="; + x86_64-linux = "sha256-52Sq7YJHhs0UICMOtEDta+bY7b/1SdNfzUOigQhH3E4="; aarch64-linux = x86_64-linux; - aarch64-darwin = "sha256-XW6AV0tzrEWizn4G0KEXegEcNmlTJl6mZ92ZRmz17HM="; + aarch64-darwin = "sha256-9AJbuA1WDGiln2ea0nqD9lDMhKWdYyVkgFyFLB6/Etc="; x86_64-darwin = aarch64-darwin; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -93,7 +106,7 @@ buildGoModule rec { postPatch = patchGoVersion; - vendorHash = "sha256-Pt87hb0+EuGd62ld65jTszeTy7GZZbviH8X9qCGOaJQ="; + vendorHash = "sha256-cYE43OAagPHFhWsUJLMcJVfsJj6d0vUqzjbAviYSuSc="; proxyVendor = true; From ffafad5cc343e2aadafe21bb622d197d958cdc8d Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Fri, 28 Mar 2025 09:42:22 +0100 Subject: [PATCH 022/107] python3Packages.mcp: 1.3.0 -> 1.5.0 --- pkgs/development/python-modules/mcp/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mcp/default.nix b/pkgs/development/python-modules/mcp/default.nix index 0cd8d583e6b2..654a284178f8 100644 --- a/pkgs/development/python-modules/mcp/default.nix +++ b/pkgs/development/python-modules/mcp/default.nix @@ -10,6 +10,7 @@ pydantic, pydantic-settings, pytest-asyncio, + pytest-examples, pytestCheckHook, python-dotenv, rich, @@ -17,21 +18,25 @@ starlette, typer, uvicorn, + websockets, }: buildPythonPackage rec { pname = "mcp"; - version = "1.3.0"; + version = "1.5.0"; pyproject = true; src = fetchFromGitHub { owner = "modelcontextprotocol"; repo = "python-sdk"; tag = "v${version}"; - hash = "sha256-DbRXD4o/uFfpGvrux8lm7/t2utdFDEFg2G7CiraCJd0="; + hash = "sha256-Z2NN6k4mD6NixDON1MUOELpBZW9JvMvFErcCbFPdg2o="; }; postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail ', "uv-dynamic-versioning"' "" \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' substituteInPlace tests/client/test_stdio.py \ --replace '/usr/bin/tee' '${lib.getExe' coreutils "tee"}' ''; @@ -61,18 +66,24 @@ buildPythonPackage rec { rich = [ rich ]; + ws = [ + websockets + ]; }; pythonImportsCheck = [ "mcp" ]; nativeCheckInputs = [ pytest-asyncio + pytest-examples pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ # attempts to run the package manager uv "test_command_execution" + # performance-dependent test + "test_messages_are_executed_concurrently" ]; __darwinAllowLocalNetworking = true; From 2d9de404decaf9e54b1601f5771cea8d54909e02 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 28 Mar 2025 14:25:08 +0100 Subject: [PATCH 023/107] flint3: 3.1.2 -> 3.2.1 --- pkgs/development/libraries/flint/3.nix | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/flint/3.nix b/pkgs/development/libraries/flint/3.nix index b7bb781363b4..8e49235c6d0d 100644 --- a/pkgs/development/libraries/flint/3.nix +++ b/pkgs/development/libraries/flint/3.nix @@ -1,7 +1,6 @@ { lib, stdenv, - fetchpatch, fetchurl, gmp, mpfr, @@ -23,26 +22,13 @@ assert stdenv.mkDerivation rec { pname = "flint3"; - version = "3.1.2"; + version = "3.2.1"; src = fetchurl { - url = "https://www.flintlib.org/flint-${version}.tar.gz"; - sha256 = "sha256-/bOkMaN0ZINKz/O9wUX0/o0PlR3VMnxMb5P0y6xcJwA="; + url = "https://flintlib.org/download/flint-${version}.tar.gz"; + hash = "sha256-ynvkbXeXInfrb+DE92dUhDL1a7U0qhfW26LXzOFc0j8="; }; - patches = [ - (fetchpatch { - url = "https://github.com/flintlib/flint/commit/e7d005c369754243cba32bd782ea2a5fc874fde5.diff"; - hash = "sha256-IqEtYEpNVXfoTeerh/0ig+eDqUpAlGdBB3uO8ShYh3o="; - }) - # C99 compliance (avoid using I as identifier): https://github.com/flintlib/flint/pull/2027 - (fetchpatch { - name = "flint3-reserved-identifier.patch"; - url = "https://github.com/flintlib/flint/commit/b579cdd2d45aa1109a764f6838e9888b937e7ac5.patch"; - hash = "sha256-8GLlA9ACzzxSiYaxLv9+p0oJA5TS7289b0EyoNcsSaU="; - }) - ]; - nativeBuildInputs = [ autoconf automake @@ -68,8 +54,6 @@ stdenv.mkDerivation rec { # We're not using autoreconfHook because flint's bootstrap # script calls autoreconf, among other things. preConfigure = '' - # the following configure.ac fix is only needed for flint 3.1.X - sed -i 's/if "$ac_cv_prog_cxx_g" = "yes"/if test "$ac_cv_prog_cxx_g" = "yes"/' configure.ac echo "Executing bootstrap.sh" ./bootstrap.sh ''; @@ -92,7 +76,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast Library for Number Theory"; - license = licenses.gpl2Plus; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ smasher164 ] ++ teams.sage.members; platforms = platforms.unix; homepage = "https://www.flintlib.org/"; From 9c954c604fe66acbb1b3f8f435514bff66e6bd7e Mon Sep 17 00:00:00 2001 From: jayay Date: Sun, 16 Mar 2025 17:53:51 +0100 Subject: [PATCH 024/107] gprbuild: add compiler configuration for aarch64-unknown-linux-gnu Fixes gprbuild to find `ar`, `cr` and `nm` for native aarch64-linux compilation of Ada projects. --- .../ada-modules/gprbuild/nixpkgs-gnat.xml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/pkgs/development/ada-modules/gprbuild/nixpkgs-gnat.xml b/pkgs/development/ada-modules/gprbuild/nixpkgs-gnat.xml index ead88dc365c1..b7e5d180dc5a 100644 --- a/pkgs/development/ada-modules/gprbuild/nixpkgs-gnat.xml +++ b/pkgs/development/ada-modules/gprbuild/nixpkgs-gnat.xml @@ -53,4 +53,37 @@ + + + + + + + + + + for Archive_Builder use ("ar", "cr"); + for Archive_Builder_Append_Option use ("q"); + for Archive_Indexer use ("ranlib"); + for Archive_Suffix use ".a"; + + + + + + + + + + + + for Object_Lister use ("nm", "-g"); + for Object_Lister_Matcher use " [TDRBSG] (.*)"; + + package Linker is + for Export_File_Format use "GNU"; + for Export_File_Switch use "-Wl,--version-script="; + end Linker; + + From 5f7505bb23f6089f359979baa4bb1e520139f925 Mon Sep 17 00:00:00 2001 From: jayay Date: Sat, 22 Mar 2025 17:31:45 +0100 Subject: [PATCH 025/107] gnatprove: mute warnings about type conversion for aarch64 --- .../0002-mute-aarch64-warnings.patch | 22 +++++++++++++++++++ .../ada-modules/gnatprove/default.nix | 3 +++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/ada-modules/gnatprove/0002-mute-aarch64-warnings.patch diff --git a/pkgs/development/ada-modules/gnatprove/0002-mute-aarch64-warnings.patch b/pkgs/development/ada-modules/gnatprove/0002-mute-aarch64-warnings.patch new file mode 100644 index 000000000000..febe5daab9a4 --- /dev/null +++ b/pkgs/development/ada-modules/gnatprove/0002-mute-aarch64-warnings.patch @@ -0,0 +1,22 @@ +--- a/src/counterexamples/ce_parsing.adb 2025-03-14 21:48:15.657409808 +0100 ++++ b/src/counterexamples/ce_parsing.adb 2025-03-14 22:04:32.114664704 +0100 +@@ -975,6 +975,9 @@ + elsif Is_Extended_Precision_Floating_Point_Type (Ty) then + pragma Assert (Size (Exp) = 15); + pragma Assert (Size (Significand) = 63); ++ pragma Warnings (Off, "assertion will fail at run time"); ++ pragma Warnings (Off, ++ "types for unchecked conversion have different sizes"); + declare + package P is new Parse_Conversion + (Interfaces.Unsigned_128, Long_Long_Float); +@@ -983,6 +986,9 @@ + begin + return (Float_K, (Extended_K, F)); + end; ++ pragma Warnings (On, ++ "types for unchecked conversion have different sizes"); ++ pragma Warnings (On, "assertion will fail at run time"); + else + raise Program_Error; + end if; diff --git a/pkgs/development/ada-modules/gnatprove/default.nix b/pkgs/development/ada-modules/gnatprove/default.nix index 405e3bc1e944..a7af40beae30 100644 --- a/pkgs/development/ada-modules/gnatprove/default.nix +++ b/pkgs/development/ada-modules/gnatprove/default.nix @@ -56,6 +56,9 @@ let patches = [ # Disable Coq related targets which are missing in the fsf-14 branch ./0001-fix-install.patch + + # Suppress warnings on aarch64: https://github.com/AdaCore/spark2014/issues/54 + ./0002-mute-aarch64-warnings.patch ]; commit_date = "2024-01-11"; }; From 9ff690061501ee2f04f25c8a11d66d901510d8a7 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Fri, 28 Mar 2025 16:52:04 -0400 Subject: [PATCH 026/107] incus: 6.10.1 -> 6.11.0 https://discuss.linuxcontainers.org/t/incus-6-11-has-been-released/23322 https://github.com/lxc/incus/releases/tag/v6.11.0 --- nixos/modules/virtualisation/incus.nix | 3 +++ pkgs/by-name/in/incus/package.nix | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index c29c3215b722..dc5c30844e7c 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -62,6 +62,9 @@ let skopeo umoci ] + ++ lib.optionals (lib.versionAtLeast cfg.package.version "6.11.0") [ + lego + ] ++ lib.optionals config.security.apparmor.enable [ apparmor-bin-utils diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix index 9216562d3a93..c963f378a0e7 100644 --- a/pkgs/by-name/in/incus/package.nix +++ b/pkgs/by-name/in/incus/package.nix @@ -1,7 +1,7 @@ import ./generic.nix { - hash = "sha256-uuaJoUrAZ1kSeO2xdXhfdI8Zy4zbA9r1pIhPMqzUios="; - version = "6.10.1"; - vendorHash = "sha256-/8aBG8RiC03+oVI9lgPFwbi3b4juumziXL4WH0k/4PA="; + hash = "sha256-S6PTtgP4MFV+kiEgV8PBvek1SrVjLaCR9OJy/6jqJGE="; + version = "6.11.0"; + vendorHash = "sha256-wKL+woCMjGJwCBG/JBhFbY4uc97/5K7OWPZRp0J+5DQ="; patches = [ ]; nixUpdateExtraArgs = [ "--override-filename=pkgs/by-name/in/incus/package.nix" From 991f6229ad785c57ea05e0717bd29e60e05060ef Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 Mar 2025 11:04:09 +0100 Subject: [PATCH 027/107] waybackurls: init at 0.1.0 Tool to fetch all the URLs that the Wayback Machine knows about for a domain https://github.com/tomnomnom/waybackurls --- pkgs/by-name/wa/waybackurls/package.nix | 33 +++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/wa/waybackurls/package.nix diff --git a/pkgs/by-name/wa/waybackurls/package.nix b/pkgs/by-name/wa/waybackurls/package.nix new file mode 100644 index 000000000000..aab020b0806c --- /dev/null +++ b/pkgs/by-name/wa/waybackurls/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "waybackurls"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "tomnomnom"; + repo = "waybackurls"; + tag = "v${version}"; + hash = "sha256-aX6pCEp2809oYn1BUwdfKzJzMttnZItGXC1QL4yMztg="; + }; + + vendorHash = null; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "Tool to fetch all the URLs that the Wayback Machine knows about for a domain"; + homepage = "https://github.com/tomnomnom/waybackurls"; + changelog = "https://github.com/tomnomnom/waybackurls/releases/tag/${src.tag}"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "waybackurls"; + }; +} From cbd704ca1c88bfe456e8e320b18d163320a98f33 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Fri, 28 Mar 2025 09:42:22 +0100 Subject: [PATCH 028/107] libpsm2: mark musl as broken --- pkgs/by-name/li/libpsm2/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/li/libpsm2/package.nix b/pkgs/by-name/li/libpsm2/package.nix index e7591afaf2b9..45ae93c032c8 100644 --- a/pkgs/by-name/li/libpsm2/package.nix +++ b/pkgs/by-name/li/libpsm2/package.nix @@ -53,5 +53,7 @@ stdenv.mkDerivation rec { ]; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.bzizou ]; + # uses __off64_t, srand48_r, lrand48_r, drand48_r + broken = stdenv.hostPlatform.isMusl; }; } From d0cb1cb0aa1659b440288c6cad68ec85b9ee1c84 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 29 Mar 2025 13:52:17 +0000 Subject: [PATCH 029/107] xfce.xfce4-session: 4.20.0 -> 4.20.2 https://gitlab.xfce.org/xfce/xfce4-session/-/compare/xfce4-session-4.20.0...xfce4-session-4.20.2 --- .../xfce/core/xfce4-session/default.nix | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfce4-session/default.nix b/pkgs/desktops/xfce/core/xfce4-session/default.nix index 79d131723e6f..a79b8793dd56 100644 --- a/pkgs/desktops/xfce/core/xfce4-session/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-session/default.nix @@ -1,5 +1,6 @@ { lib , mkXfceDerivation +, fetchpatch , polkit , exo , libxfce4util @@ -17,9 +18,25 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-session"; - version = "4.20.0"; + version = "4.20.2"; - sha256 = "sha256-mn3ky1NzrpQZRkhc605mj+GFhbFq26eW59YKUfnX9X8="; + sha256 = "sha256-wd+8W9Z0dH7bqILBUNG9YxpRf8TnRJ/7b3QviM1HVnY="; + + patches = [ + # Use syntax compatible with most sh shells + # The `**` syntax is a bash extension + (fetchpatch { + url = "https://gitlab.xfce.org/xfce/xfce4-session/-/commit/53d6e20a29948ae7aa179447cef0704786b77f8b.patch"; + hash = "sha256-c8IU1VOcEYdZJy8Eq2wqSL5tTXt7gKfGOs7jxb8npOE="; + }) + + # wayland: start a D-Bus session only if there isn't one already + # https://gitlab.xfce.org/xfce/xfce4-session/-/issues/218 + (fetchpatch { + url = "https://gitlab.xfce.org/xfce/xfce4-session/-/commit/f6e2805b8a7742172f399d78618313bcb28bf095.patch"; + hash = "sha256-EViVialDbdLH2SGUtcroo5iGc+B4HVJajV7PMl5q6vs="; + }) + ]; buildInputs = [ exo From 97d01f5cc533c865f37faeef6ab2636d5e679e68 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Sat, 29 Mar 2025 15:34:42 -0700 Subject: [PATCH 030/107] grun: drop --- pkgs/by-name/gr/grun/package.nix | 42 -------------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 pkgs/by-name/gr/grun/package.nix diff --git a/pkgs/by-name/gr/grun/package.nix b/pkgs/by-name/gr/grun/package.nix deleted file mode 100644 index 0401b6d3a332..000000000000 --- a/pkgs/by-name/gr/grun/package.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - gtk2, - pkg-config, - autoreconfHook, -}: - -stdenv.mkDerivation { - pname = "grun"; - version = "0.9.3"; - - src = fetchFromGitHub { - owner = "lrgc"; - repo = "grun"; - rev = "release_0_9_3"; - hash = "sha256-VbvX0wrgMIPmPnu3aQdtQ6H0X3umi8aJ42QvmmeMrJ0="; - }; - - buildInputs = [ - gtk2 - ]; - - nativeBuildInputs = [ - pkg-config - autoreconfHook - ]; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; - - meta = { - description = "Application launcher written in C and using GTK for the interface"; - mainProgram = "grun"; - homepage = "https://github.com/lrgc/grun"; - platforms = lib.platforms.linux; - license = with lib.licenses; [ gpl2Only ]; - maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dd3de5da4ec4..e0ba886f6db3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -652,6 +652,7 @@ mapAliases { green-pdfviewer = throw "'green-pdfviewer' has been removed due to lack of maintenance upstream."; # Added 2024-12-04 gringo = clingo; # added 2022-11-27 grub2_full = grub2; # Added 2022-11-18 + grun = throw "grun has been removed due to lack of maintenance upstream and depending on gtk2"; # Added 2025-03-29 gtetrinet = throw "'gtetrinet' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27 gtk-engine-bluecurve = "'gtk-engine-bluecurve' has been removed as it has been archived upstream."; # Added 2024-12-04 gtk2fontsel = throw "'gtk2fontsel' has been removed due to lack of maintenance upstream. GTK now has a built-in font chooser so it's no longer needed for newer apps"; # Added 2024-10-19 From 31b8468afb6f312aa221a5f05aba7cc4bbd604e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Mar 2025 01:39:41 +0000 Subject: [PATCH 031/107] networkmanager_strongswan: 1.6.1 -> 1.6.2 --- pkgs/by-name/ne/networkmanager_strongswan/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/networkmanager_strongswan/package.nix b/pkgs/by-name/ne/networkmanager_strongswan/package.nix index 27ad86a94d45..1f19a10087c1 100644 --- a/pkgs/by-name/ne/networkmanager_strongswan/package.nix +++ b/pkgs/by-name/ne/networkmanager_strongswan/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "NetworkManager-strongswan"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { url = "https://download.strongswan.org/NetworkManager/${pname}-${version}.tar.bz2"; - sha256 = "sha256-IMb5vOVGvMHeO1h5AJM1gCgSBMluhn1nYA1b8zC4EbY="; + sha256 = "sha256-jL8kf63MsCbTTvYn1M7YbpUOMXPl2h/ZY7Rpz2rAr34="; }; nativeBuildInputs = [ From 1a176f76e3438c1d74663da9c314d28abbdfb04e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Mar 2025 02:13:49 +0000 Subject: [PATCH 032/107] mise: 2025.3.6 -> 2025.3.11 --- pkgs/by-name/mi/mise/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix index f68e39526313..29355753f408 100644 --- a/pkgs/by-name/mi/mise/package.nix +++ b/pkgs/by-name/mi/mise/package.nix @@ -23,17 +23,17 @@ rustPlatform.buildRustPackage rec { pname = "mise"; - version = "2025.3.6"; + version = "2025.3.11"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; rev = "v${version}"; - hash = "sha256-wp/C7RrMcpk/BFath9zZbEMzhQWFYagnT2zimnPRpPI="; + hash = "sha256-n7A6LGjcVz6LWz8fkkG5XS2WZf3FFkbidnt/S5jxy5g="; }; useFetchCargoVendor = true; - cargoHash = "sha256-49C4MzvGUiO16kNEKoHtlvkOxG16jsD2iW5upaVuYGI="; + cargoHash = "sha256-On2+ROA71RyZdFPvH4Zem/494Q4uCYS4EZSvQL1DDWQ="; nativeBuildInputs = [ installShellFiles From 49b4c01f5ef422fb8f3290819abc2cfc772102bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 29 Mar 2025 19:59:39 -0700 Subject: [PATCH 033/107] poetry: 2.1.1 -> 2.1.2 Diff: https://github.com/python-poetry/poetry/compare/refs/tags/2.1.1...2.1.2 Changelog: https://github.com/python-poetry/poetry/blob/refs/tags/2.1.2/CHANGELOG.md --- pkgs/by-name/po/poetry/package.nix | 4 ++-- pkgs/by-name/po/poetry/unwrapped.nix | 13 ++----------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/po/poetry/package.nix b/pkgs/by-name/po/poetry/package.nix index 42d10140e5ad..5b1058a4be21 100644 --- a/pkgs/by-name/po/poetry/package.nix +++ b/pkgs/by-name/po/poetry/package.nix @@ -17,12 +17,12 @@ let # We keep the override around even when the versions match, as # it's likely to become relevant again after the next Poetry update. poetry-core = super.poetry-core.overridePythonAttrs (old: rec { - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "python-poetry"; repo = "poetry-core"; tag = version; - hash = "sha256-DeDfDaP+jPrN6F/lv6shVOG6+4VdD1nL9mz1wJn55Sc="; + hash = "sha256-fNj/LI4A4RjjPzYT+0ekwqmm3qzzZL3aACOe8BHviuk="; }; }); } diff --git a/pkgs/by-name/po/poetry/unwrapped.nix b/pkgs/by-name/po/poetry/unwrapped.nix index 0ef2a0f2ee9e..95e683c07dfb 100644 --- a/pkgs/by-name/po/poetry/unwrapped.nix +++ b/pkgs/by-name/po/poetry/unwrapped.nix @@ -4,7 +4,6 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - fetchpatch2, findpython, installShellFiles, build, @@ -38,7 +37,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "2.1.1"; + version = "2.1.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -47,17 +46,9 @@ buildPythonPackage rec { owner = "python-poetry"; repo = "poetry"; tag = version; - hash = "sha256-2u0idmnXY0FNvc8peDMWIFAeGH/xdIfMrMErUdxc0UA="; + hash = "sha256-51pO/PP5OwTmi+1uy26CK/1oQ/P21wPBoRVE9Jv0TjA="; }; - patches = [ - # https://github.com/python-poetry/poetry/pull/9939 - (fetchpatch2 { - url = "https://github.com/python-poetry/poetry/commit/c2387ff3c878ab608d7616e4984fc01c4226416c.patch?full_index=1"; - hash = "sha256-cxTDbFykRr+kGk4jYzKwhU8QEZvK5A/P8zxliXpE+Sg="; - }) - ]; - build-system = [ poetry-core ]; From a6c74872117de18c2a2d2ae502828065b274ea79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 29 Mar 2025 22:42:20 -0700 Subject: [PATCH 034/107] python313Packages.py-dactyl: init at 2.0.5 --- .../python-modules/py-dactyl/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/py-dactyl/default.nix diff --git a/pkgs/development/python-modules/py-dactyl/default.nix b/pkgs/development/python-modules/py-dactyl/default.nix new file mode 100644 index 000000000000..7906828e1ba0 --- /dev/null +++ b/pkgs/development/python-modules/py-dactyl/default.nix @@ -0,0 +1,48 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + pytestCheckHook, + requests, + setuptools, +}: + +buildPythonPackage rec { + pname = "py-dactyl"; + version = "2.0.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "iamkubi"; + repo = "pydactyl"; + tag = "v${version}"; + hash = "sha256-yw5S4I4mtb9URnZ1So1nlZi4v7y0Nz4msx+8SwSi8N4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + requests + ]; + + pythonImportsCheck = [ "pydactyl" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # upstream's tests are not fully maintained + "test_get_file_contents" + "test_paginated_response_multipage_iterator" + "test_pterodactyl_client_debug_param" + ]; + + meta = { + changelog = "https://github.com/iamkubi/pydactyl/releases/tag/${src.tag}"; + description = "Python wrapper for the Pterodactyl Panel API"; + homepage = "https://github.com/iamkubi/pydactyl"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7aaf06856b21..d021eaaab78f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11554,6 +11554,8 @@ self: super: with self; { py-cpuinfo = callPackage ../development/python-modules/py-cpuinfo { }; + py-dactyl = callPackage ../development/python-modules/py-dactyl { }; + py-datastruct = callPackage ../development/python-modules/py-datastruct { }; py-deprecate = callPackage ../development/python-modules/py-deprecate { }; From e675cc064f896795f5ca2d98790601d2b95ed0b2 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 30 Mar 2025 15:16:06 +0800 Subject: [PATCH 035/107] emacs: make trivialBuild respect error tunables at bytecompile time This is a follow-up of 2f7cc5a7812bd4b4758312051a72b0a618072cd4. --- pkgs/applications/editors/emacs/build-support/trivial.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/build-support/trivial.nix b/pkgs/applications/editors/emacs/build-support/trivial.nix index f95b6f3cdfc3..b37dfcccfb63 100644 --- a/pkgs/applications/editors/emacs/build-support/trivial.nix +++ b/pkgs/applications/editors/emacs/build-support/trivial.nix @@ -19,7 +19,12 @@ lib.extendMkDerivation { foundMakefile=1 fi - emacs -l package -f package-initialize -L . --batch -f batch-byte-compile *.el + emacs -l package -f package-initialize \ + --eval "(setq byte-compile-debug ${if finalAttrs.ignoreCompilationError then "nil" else "t"})" \ + --eval "(setq byte-compile-error-on-warn ${ + if finalAttrs.turnCompilationWarningToError then "t" else "nil" + })" \ + -L . --batch -f batch-byte-compile *.el runHook postBuild ''; From c28df727e7139ef0d308cd55b5a63a6cbd4baeb4 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Sun, 30 Mar 2025 11:47:35 +0200 Subject: [PATCH 036/107] casadi: 3.6.7 -> 3.7.0 Diff: https://github.com/casadi/casadi/compare/3.6.7...3.7.0 --- pkgs/by-name/ca/casadi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/casadi/package.nix b/pkgs/by-name/ca/casadi/package.nix index c8a33978313b..8cf856a27a8f 100644 --- a/pkgs/by-name/ca/casadi/package.nix +++ b/pkgs/by-name/ca/casadi/package.nix @@ -38,13 +38,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "casadi"; - version = "3.6.7"; + version = "3.7.0"; src = fetchFromGitHub { owner = "casadi"; repo = "casadi"; rev = finalAttrs.version; - hash = "sha256-Mft0qhjdAbU82RgjYuKue5p7EqbTbt3ii5yXSsCFHrQ="; + hash = "sha256-WumXAWO65XnNQqHMqAwfj2Y+KGOVTWx95qIuyE1M9us="; }; patches = [ From 7b044daaf13f047d659e45b3db0817a4a1ada419 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Mar 2025 10:27:07 +0000 Subject: [PATCH 037/107] spider: 2.34.2 -> 2.36.2 --- pkgs/by-name/sp/spider/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sp/spider/package.nix b/pkgs/by-name/sp/spider/package.nix index ff94172eeae9..9314b3a2a3bf 100644 --- a/pkgs/by-name/sp/spider/package.nix +++ b/pkgs/by-name/sp/spider/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "spider"; - version = "2.34.2"; + version = "2.36.2"; src = fetchFromGitHub { owner = "spider-rs"; repo = "spider"; tag = "v${finalAttrs.version}"; - hash = "sha256-3KEOzrIFizVBZRI1pD1PeNVj1IiV3ImucW77qHJhDM8="; + hash = "sha256-Os94Q8RDaKc3jzir63nZ8dWgPwPZHxnvOZg2l/4v5EE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Hn9rQ9yv7vekmtGWorETK1b5rdfW0M/88Q6IvH51oE0="; + cargoHash = "sha256-v5zz9WLj2aLRUHJScVSFzoQhyOqExkN03j3N47f3lgA="; nativeBuildInputs = [ pkg-config From 064432a51969b027ba80e7daf50ef7f5fbd1858e Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 28 Mar 2025 17:09:32 +0100 Subject: [PATCH 038/107] nixos/postgrest: init module --- .../manual/release-notes/rl-2505.section.md | 2 + nixos/modules/module-list.nix | 1 + .../modules/services/databases/postgrest.nix | 311 ++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/postgrest.nix | 88 +++++ .../haskell-modules/configuration-nix.nix | 1 + 6 files changed, 404 insertions(+) create mode 100644 nixos/modules/services/databases/postgrest.nix create mode 100644 nixos/tests/postgrest.nix diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 80ab576b438c..7f0ad316e5db 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -126,6 +126,8 @@ - [Autotier](https://github.com/45Drives/autotier), a passthrough FUSE filesystem. Available as [services.autotierfs](options.html#opt-services.autotierfs.enable). +- [PostgREST](https://postgrest.org), a standalone web server that turns your PostgreSQL database directly into a RESTful API. Available as [services.postgrest](options.html#opt-services.postgrest.enable). + - [µStreamer](https://github.com/pikvm/ustreamer), a lightweight MJPEG-HTTP streamer. Available as [services.ustreamer](options.html#opt-services.ustreamer). - [Whoogle Search](https://github.com/benbusby/whoogle-search), a self-hosted, ad-free, privacy-respecting metasearch engine. Available as [services.whoogle-search](options.html#opt-services.whoogle-search.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 902503335169..e6c5f4384b0f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -513,6 +513,7 @@ ./services/databases/pgbouncer.nix ./services/databases/pgmanage.nix ./services/databases/postgresql.nix + ./services/databases/postgrest.nix ./services/databases/redis.nix ./services/databases/surrealdb.nix ./services/databases/tigerbeetle.nix diff --git a/nixos/modules/services/databases/postgrest.nix b/nixos/modules/services/databases/postgrest.nix new file mode 100644 index 000000000000..34d36bae0bee --- /dev/null +++ b/nixos/modules/services/databases/postgrest.nix @@ -0,0 +1,311 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.postgrest; + + # Turns an attrset of libpq connection params: + # { + # dbname = "postgres"; + # user = "authenticator"; + # } + # into a libpq connection string: + # dbname=postgres user=authenticator + db-uri = lib.pipe (cfg.settings.db-uri or { }) [ + (lib.filterAttrs (_: v: v != null)) + (lib.mapAttrsToList (k: v: "${k}=${v}")) + (lib.concatStringsSep " ") + ]; + + # Writes a postgrest config file according to: + # https://hackage.haskell.org/package/configurator-0.3.0.0/docs/Data-Configurator.html + # Only a subset of the functionality is used by PostgREST. + configFile = lib.pipe (cfg.settings // { inherit db-uri; }) [ + (lib.filterAttrs (_: v: v != null)) + + (lib.mapAttrs ( + _: v: + if true == v then + "true" + else if false == v then + "false" + else if lib.isInt v then + toString v + else + "\"${lib.escape [ "\"" ] v}\"" + )) + + (lib.mapAttrsToList (k: v: "${k} = ${v}")) + (lib.concatStringsSep "\n") + (pkgs.writeText "postgrest.conf") + ]; +in + +{ + meta = { + maintainers = with lib.maintainers; [ wolfgangwalther ]; + }; + + options.services.postgrest = { + enable = lib.mkEnableOption "PostgREST"; + + pgpassFile = lib.mkOption { + type = + with lib.types; + nullOr (pathWith { + inStore = false; + absolute = true; + }); + default = null; + example = "/run/keys/db_password"; + description = '' + The password to authenticate to PostgreSQL with. + Not needed for peer or trust based authentication. + + The file must be a valid `.pgpass` file as described in: + + + In most cases, the following will be enough: + ``` + *:*:*:*: + ``` + ''; + }; + + jwtSecretFile = lib.mkOption { + type = + with lib.types; + nullOr (pathWith { + inStore = false; + absolute = true; + }); + default = null; + example = "/run/keys/jwt_secret"; + description = '' + The secret or JSON Web Key (JWK) (or set) used to decode JWT tokens clients provide for authentication. + For security the key must be at least 32 characters long. + If this parameter is not specified then PostgREST refuses authentication requests. + + + ''; + }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = + with lib.types; + attrsOf (oneOf [ + bool + ints.unsigned + str + ]); + + options = { + admin-server-port = lib.mkOption { + type = with lib.types; nullOr port; + default = null; + description = '' + Specifies the port for the admin server, which can be used for healthchecks. + + + ''; + }; + + db-config = lib.mkOption { + type = lib.types.bool; + default = false; + example = true; + description = '' + Enables the in-database configuration. + + + + ::: {.note} + This is enabled by default upstream, but disabled by default in this module. + ::: + ''; + }; + + db-uri = lib.mkOption { + type = lib.types.submodule { + freeformType = with lib.types; attrsOf str; + + # This should not be used; use pgpassFile instead. + options.password = lib.mkOption { + default = null; + readOnly = true; + internal = true; + }; + # This should not be used; use pgpassFile instead. + options.passfile = lib.mkOption { + default = null; + readOnly = true; + internal = true; + }; + }; + default = { }; + description = '' + libpq connection parameters as documented in: + + + + ::: {.note} + The `settings.db-uri.password` and `settings.db-uri.passfile` options are blocked. + Use [`pgpassFile`](#opt-services.postgrest.pgpassFile) instead. + ::: + ''; + example = lib.literalExpression '' + { + host = "localhost"; + dbname = "postgres"; + } + ''; + }; + + # This should not be used; use jwtSecretFile instead. + jwt-secret = lib.mkOption { + default = null; + readOnly = true; + internal = true; + }; + + server-host = lib.mkOption { + type = with lib.types; nullOr str; + default = "127.0.0.1"; + description = '' + Where to bind the PostgREST web server. + + ::: {.note} + The admin server will also bind here, but potentially exposes sensitive information. + Make sure you turn off the admin server, when opening this to the public. + + + ::: + ''; + }; + + server-port = lib.mkOption { + type = with lib.types; nullOr port; + default = null; + example = 3000; + description = '' + The TCP port to bind the web server. + ''; + }; + + server-unix-socket = lib.mkOption { + type = with lib.types; nullOr path; + default = "/run/postgrest/postgrest.sock"; + description = '' + Unix domain socket where to bind the PostgREST web server. + ''; + }; + }; + }; + default = { }; + description = '' + PostgREST configuration as documented in: + + + `db-uri` is represented as an attribute set, see [`settings.db-uri`](#opt-services.postgrest.settings.db-uri) + + ::: {.note} + The `settings.jwt-secret` option is blocked. + Use [`jwtSecretFile`](#opt-services.postgrest.jwtSecretFile) instead. + ::: + ''; + example = lib.literalExpression '' + { + db-anon-role = "anon"; + db-uri.dbname = "postgres"; + "app.settings.custom" = "value"; + } + ''; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = (cfg.settings.server-port == null) != (cfg.settings.server-unix-socket == null); + message = '' + PostgREST can listen either on a TCP port or on a unix socket, but not both. + Please set one of `settings.server-port`](#opt-services.postgrest.jwtSecretFile) or `settings.server-unix-socket` to `null`. + + + ''; + } + ]; + + warnings = + lib.optional (cfg.settings.admin-server-port != null && cfg.settings.server-host != "127.0.0.1") + "The PostgREST admin server is potentially listening on a public host. This may expose sensitive information via the `/config` endpoint."; + + systemd.services.postgrest = { + description = "PostgREST"; + + wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; + after = [ + "network-online.target" + "postgresql.service" + ]; + + serviceConfig = { + CacheDirectory = "postgrest"; + CacheDirectoryMode = "0700"; + Environment = + lib.optional (cfg.pgpassFile != null) "PGPASSFILE=%C/postgrest/pgpass" + ++ lib.optional (cfg.jwtSecretFile != null) "PGRST_JWT_SECRET=@%d/jwt_secret"; + LoadCredential = + lib.optional (cfg.pgpassFile != null) "pgpass:${cfg.pgpassFile}" + ++ lib.optional (cfg.jwtSecretFile != null) "jwt_secret:${cfg.jwtSecretFile}"; + Restart = "always"; + RuntimeDirectory = "postgrest"; + User = "postgrest"; + + # Hardening + CapabilityBoundingSet = [ "" ]; + DevicePolicy = "closed"; + DynamicUser = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateIPC = true; + PrivateMounts = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "" ]; + UMask = "0077"; + }; + + # Copy the pgpass file to different location, to have it report mode 0400. + # Fixes: https://github.com/systemd/systemd/issues/29435 + script = '' + if [ -f "$CREDENTIALS_DIRECTORY/pgpass" ]; then + cp -f "$CREDENTIALS_DIRECTORY/pgpass" "$CACHE_DIRECTORY/pgpass" + fi + exec ${lib.getExe pkgs.postgrest} ${configFile} + ''; + }; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 27124bb953d7..917658d92ee3 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -972,6 +972,7 @@ in { postfix-raise-smtpd-tls-security-level = handleTest ./postfix-raise-smtpd-tls-security-level.nix {}; postfixadmin = handleTest ./postfixadmin.nix {}; postgresql = handleTest ./postgresql {}; + postgrest = runTest ./postgrest.nix; powerdns = handleTest ./powerdns.nix {}; powerdns-admin = handleTest ./powerdns-admin.nix {}; power-profiles-daemon = handleTest ./power-profiles-daemon.nix {}; diff --git a/nixos/tests/postgrest.nix b/nixos/tests/postgrest.nix new file mode 100644 index 000000000000..bc503c41893c --- /dev/null +++ b/nixos/tests/postgrest.nix @@ -0,0 +1,88 @@ +{ lib, ... }: +{ + name = "postgrest"; + + meta = { + maintainers = with lib.maintainers; [ wolfgangwalther ]; + }; + + nodes.machine = + { + config, + lib, + pkgs, + ... + }: + { + services.postgresql = { + enable = true; + initialScript = pkgs.writeText "init.sql" '' + CREATE ROLE postgrest LOGIN NOINHERIT; + CREATE ROLE anon ROLE postgrest; + + CREATE ROLE postgrest_with_password LOGIN NOINHERIT PASSWORD 'password'; + CREATE ROLE authenticated ROLE postgrest_with_password; + ''; + }; + + services.postgrest = { + enable = true; + settings = { + admin-server-port = 3001; + db-anon-role = "anon"; + db-uri.dbname = "postgres"; + }; + }; + + specialisation.withSecrets.configuration = { + services.postgresql.enableTCPIP = true; + services.postgrest = { + pgpassFile = "/run/secrets/.pgpass"; + jwtSecretFile = "/run/secrets/jwt.secret"; + settings.db-uri.host = "localhost"; + settings.db-uri.user = "postgrest_with_password"; + settings.server-port = 3000; + settings.server-unix-socket = null; + }; + }; + }; + + extraPythonPackages = p: [ p.pyjwt ]; + + testScript = + { nodes, ... }: + let + withSecrets = "${nodes.machine.system.build.toplevel}/specialisation/withSecrets"; + in + '' + import jwt + + machine.wait_for_unit("postgresql.service") + + def wait_for_postgrest(): + machine.wait_for_unit("postgrest.service") + machine.wait_until_succeeds("curl --fail -s http://localhost:3001/ready", timeout=30) + + with subtest("anonymous access"): + wait_for_postgrest() + machine.succeed( + "curl --fail-with-body --no-progress-meter --unix-socket /run/postgrest/postgrest.sock http://localhost", + timeout=2 + ) + + machine.execute(""" + mkdir -p /run/secrets + echo "*:*:*:*:password" > /run/secrets/.pgpass + echo reallyreallyreallyreallyverysafe > /run/secrets/jwt.secret + """) + + with subtest("authenticated access"): + machine.succeed("${withSecrets}/bin/switch-to-configuration test >&2") + wait_for_postgrest() + token = jwt.encode({ "role": "authenticated" }, "reallyreallyreallyreallyverysafe") + machine.succeed( + f"curl --fail-with-body --no-progress-meter -H 'Authorization: Bearer {token}' http://localhost:3000", + timeout=2 + ) + ''; +} diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 9ba180a102ee..e57f935d6cdc 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -439,6 +439,7 @@ self: super: builtins.intersectAttrs super { dontCheck enableSeparateBinOutput (self.generateOptparseApplicativeCompletions [ "postgrest" ]) + (overrideCabal { passthru.tests = pkgs.nixosTests.postgrest; }) ]; # Tries to mess with extended POSIX attributes, but can't in our chroot environment. From 428cb0a2add2970fe82c1dc7f88fbdaab687b9e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Mar 2025 12:38:07 +0000 Subject: [PATCH 039/107] prometheus-mongodb-exporter: 0.43.1 -> 0.44.0 --- pkgs/servers/monitoring/prometheus/mongodb-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix b/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix index c22a8e8dcda4..b9f3983d5a56 100644 --- a/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mongodb_exporter"; - version = "0.43.1"; + version = "0.44.0"; src = fetchFromGitHub { owner = "percona"; repo = "mongodb_exporter"; rev = "v${version}"; - hash = "sha256-lf5sh9ADz1L5thNsjj1EdGJGuNmlcFOMUxwOUZUf8Xo="; + hash = "sha256-FwY4rAmv7P55EGfEHrs0y15BvU3qnq0VHf37R7W2yA4="; }; - vendorHash = "sha256-c5PET4xGR2RzgOW9gUxo2JB/P1XO1JgWr2hQ/vGfk6E="; + vendorHash = "sha256-jF6Of16mMpsCrkvtI3xZcla4/MJGpCX5YVkGM6eFfmo="; ldflags = [ "-s" From 7f5dd0333c18b1183dc71c89a1b0fc1858d5ad15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Mar 2025 13:22:17 +0000 Subject: [PATCH 040/107] nestopia-ue: 1.53.0 -> 1.53.1 --- pkgs/by-name/ne/nestopia-ue/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/nestopia-ue/package.nix b/pkgs/by-name/ne/nestopia-ue/package.nix index ede0fc010cc6..d976ec8649be 100644 --- a/pkgs/by-name/ne/nestopia-ue/package.nix +++ b/pkgs/by-name/ne/nestopia-ue/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nestopia"; - version = "1.53.0"; + version = "1.53.1"; src = fetchFromGitHub { owner = "0ldsk00l"; repo = "nestopia"; rev = finalAttrs.version; - hash = "sha256-C2uiC8zlleXQlThrRETJa9vu++mJy1ySJKAkgu5zuxc="; + hash = "sha256-6r6o/2GDp1Rcp+OWaQVgIQGC6NAxtmx4lxDWWpwv8aQ="; }; buildInputs = [ From 8fb8f5f80afadc2002c707c29b9e0e5eb7855160 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Mar 2025 14:22:16 +0000 Subject: [PATCH 041/107] checkstyle: 10.21.4 -> 10.22.0 --- pkgs/by-name/ch/checkstyle/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ch/checkstyle/package.nix b/pkgs/by-name/ch/checkstyle/package.nix index df835e51eb8d..aa1ddcf83d3b 100644 --- a/pkgs/by-name/ch/checkstyle/package.nix +++ b/pkgs/by-name/ch/checkstyle/package.nix @@ -1,12 +1,12 @@ { lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre }: stdenvNoCC.mkDerivation rec { - version = "10.21.4"; + version = "10.22.0"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-PB2U1uzIPgLf9YfJultrTsT+w4x6lY61h+/smyji8xg="; + sha256 = "sha256-U6QpASgCKxv3NTFINkJ9Aey4E9Y089RY5X2TNhSlIOs="; }; nativeBuildInputs = [ makeBinaryWrapper ]; From 997f337362722b9db747e03bf60a6217426c0790 Mon Sep 17 00:00:00 2001 From: Jeremiah Paige Date: Sun, 30 Mar 2025 07:28:14 -0700 Subject: [PATCH 042/107] python313Packages.awsiotsdk: patch in correct version string --- pkgs/development/python-modules/awsiotsdk/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/awsiotsdk/default.nix b/pkgs/development/python-modules/awsiotsdk/default.nix index 02da2dab2e86..f471a125350b 100644 --- a/pkgs/development/python-modules/awsiotsdk/default.nix +++ b/pkgs/development/python-modules/awsiotsdk/default.nix @@ -23,6 +23,11 @@ buildPythonPackage rec { hash = "sha256-vqx/OgQ/hgH6ULBI1I9+fD4CswQZDzfdNlhImbnQiKg="; }; + postPatch = '' + substituteInPlace awsiot/__init__.py \ + --replace-fail "__version__ = '1.0.0-dev'" "__version__ = '${version}'" + ''; + pythonRelaxDeps = [ "awscrt" ]; build-system = [ setuptools ]; From c27c394cc6f4f15b7cf0dbd8e381ce525c9f63a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Mar 2025 14:34:22 +0000 Subject: [PATCH 043/107] python312Packages.llm-gemini: 0.15 -> 0.16 --- pkgs/development/python-modules/llm-gemini/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/llm-gemini/default.nix b/pkgs/development/python-modules/llm-gemini/default.nix index 636b71b7cff6..01a7dfd7bd89 100644 --- a/pkgs/development/python-modules/llm-gemini/default.nix +++ b/pkgs/development/python-modules/llm-gemini/default.nix @@ -15,14 +15,14 @@ }: buildPythonPackage rec { pname = "llm-gemini"; - version = "0.15"; + version = "0.16"; pyproject = true; src = fetchFromGitHub { owner = "simonw"; repo = "llm-gemini"; tag = version; - hash = "sha256-NNzorEb3dVoKef+9eXzStcFAkQhnhMBVnwLBc2lA2+o="; + hash = "sha256-JtNFYEriiWi5fgIHM8hhMct4G7AdVKZhro9y40gxaZo="; }; build-system = [ @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = { description = "LLM plugin to access Google's Gemini family of models"; homepage = "https://github.com/simonw/llm-gemini"; - changelog = "https://github.com/simonw/llm-gemini/releases/tag/${version}"; + changelog = "https://github.com/simonw/llm-gemini/releases/tag/${src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ josh ]; }; From f0e8243ab5494e27ba4f71ff3779df0e291012ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Mar 2025 14:38:34 +0000 Subject: [PATCH 044/107] bibiman: 0.11.0 -> 0.11.4 --- pkgs/by-name/bi/bibiman/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bi/bibiman/package.nix b/pkgs/by-name/bi/bibiman/package.nix index 2656334ecaba..5cf56994b93c 100644 --- a/pkgs/by-name/bi/bibiman/package.nix +++ b/pkgs/by-name/bi/bibiman/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage rec { pname = "bibiman"; - version = "0.11.0"; + version = "0.11.4"; src = fetchFromGitea { domain = "codeberg.org"; owner = "lukeflo"; repo = "bibiman"; tag = "v${version}"; - hash = "sha256-g8C5yLtEHS/4Q312Rdse9FFymDXacIHqwg/ySpSt+NE="; + hash = "sha256-LYoo3j3On4oCANg0acsyL7knFhOjKW0/zBVyK20knDs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-RWLKiYyUQUgAPPWTugp1G05X3B9SbknmpVLc7eSdn8U="; + cargoHash = "sha256-VYG9KshZ4/MIgtwmfJ+sa8PKj9dgPuNgCUgqF+XRiMA="; nativeInstallCheckInputs = [ versionCheckHook From ce06e43af897e55d538c5e2c36c5cec8991cff1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Fri, 28 Mar 2025 20:58:40 +0100 Subject: [PATCH 045/107] gitleaks: re-enable checks --- pkgs/by-name/gi/gitleaks/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/gitleaks/package.nix b/pkgs/by-name/gi/gitleaks/package.nix index baab91b9de33..78de8db256a3 100644 --- a/pkgs/by-name/gi/gitleaks/package.nix +++ b/pkgs/by-name/gi/gitleaks/package.nix @@ -6,6 +6,7 @@ installShellFiles, nix-update-script, versionCheckHook, + git, }: buildGoModule rec { @@ -32,8 +33,7 @@ buildGoModule rec { versionCheckHook ]; - # With v8 the config tests are blocking - doCheck = false; + nativeCheckInputs = [ git ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd ${pname} \ From 164be9bf39831cc9da2882e9f9c4fbd20ab0b5cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Fri, 28 Mar 2025 20:58:40 +0100 Subject: [PATCH 046/107] bazelisk: doCheck = true --- pkgs/by-name/ba/bazelisk/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/ba/bazelisk/package.nix b/pkgs/by-name/ba/bazelisk/package.nix index 8d01a493308f..85018dfb7ce5 100644 --- a/pkgs/by-name/ba/bazelisk/package.nix +++ b/pkgs/by-name/ba/bazelisk/package.nix @@ -17,8 +17,6 @@ buildGoModule rec { vendorHash = "sha256-kXv7q32cFD9mwWsFaod7QPn3el72P4ugVc4DGwez8v0="; - doCheck = false; - ldflags = [ "-s" "-w" From c731506a91453ebd0bdcb9f895f76b4ec8780821 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Mar 2025 15:37:17 +0000 Subject: [PATCH 047/107] python312Packages.aiohomekit: 3.2.8 -> 3.2.13 --- pkgs/development/python-modules/aiohomekit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 4663d0fe1f54..38f7021ce3f0 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "3.2.8"; + version = "3.2.13"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = "aiohomekit"; tag = version; - hash = "sha256-b197P2hTk6lhLKm+4VvyvyPZDqb7NqO0aqoIf3BQBfs="; + hash = "sha256-J6VxfuLHdxJ92V1puOWv+dnlpBKRBww1iP6IcRMqamk="; }; build-system = [ poetry-core ]; @@ -68,7 +68,7 @@ buildPythonPackage rec { Homekit accessories. ''; homepage = "https://github.com/Jc2k/aiohomekit"; - changelog = "https://github.com/Jc2k/aiohomekit/releases/tag/${version}"; + changelog = "https://github.com/Jc2k/aiohomekit/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; mainProgram = "aiohomekitctl"; From 920a9248cb17604fb52d1c761592f567b655f4bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Mar 2025 13:26:18 +0000 Subject: [PATCH 048/107] python312Packages.databricks-sdk: 0.46.0 -> 0.49.0 --- pkgs/development/python-modules/databricks-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/databricks-sdk/default.nix b/pkgs/development/python-modules/databricks-sdk/default.nix index efd1e3a228df..4e0be21e348e 100644 --- a/pkgs/development/python-modules/databricks-sdk/default.nix +++ b/pkgs/development/python-modules/databricks-sdk/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "databricks-sdk"; - version = "0.46.0"; + version = "0.49.0"; pyproject = true; src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sdk-py"; tag = "v${version}"; - hash = "sha256-bvtIeysj3FW4Kj2WZeKSGwkqKoWIxKIzJFiduNlaBWE="; + hash = "sha256-lNP3ETmRK6sRx9mP2JuIe/OcBbCDEvipST2LUjycgjs="; }; build-system = [ From e49f314baa9dc41a8c5e7edaeee9c54707d227f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Mar 2025 16:22:22 +0000 Subject: [PATCH 049/107] civo: 1.1.98 -> 1.1.99 --- pkgs/by-name/ci/civo/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ci/civo/package.nix b/pkgs/by-name/ci/civo/package.nix index ed9da0b7ac82..7aac936bfe5a 100644 --- a/pkgs/by-name/ci/civo/package.nix +++ b/pkgs/by-name/ci/civo/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "civo"; - version = "1.1.98"; + version = "1.1.99"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - hash = "sha256-gxqVWnhlLYizoij6L9/ThM9T7K7++nGZwgFP3OzBqOY="; + hash = "sha256-30uv9vVjfjZWsUhwrgY7TYs8cAkv+v/TdsSW+VmupJM="; }; - vendorHash = "sha256-LN6rzZXw7YoHMyPCujPiyjs8tG+nN2fxwQnEenohw1c="; + vendorHash = "sha256-c4KyK0HtIW08/DQ6PLgA+M8GABrKHjAayZahkvo/Erc="; nativeBuildInputs = [ installShellFiles ]; From 8d51b1920321bcef5e5cc18bedc2d3932a93f1dd Mon Sep 17 00:00:00 2001 From: Philipp Arras Date: Sun, 30 Mar 2025 19:49:03 +0200 Subject: [PATCH 050/107] python3Packages.nanobind: 2.5.0 -> 2.6.1 --- pkgs/development/python-modules/nanobind/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/nanobind/default.nix b/pkgs/development/python-modules/nanobind/default.nix index 6f562525b0b1..9f0710b79aef 100644 --- a/pkgs/development/python-modules/nanobind/default.nix +++ b/pkgs/development/python-modules/nanobind/default.nix @@ -27,14 +27,14 @@ }: buildPythonPackage rec { pname = "nanobind"; - version = "2.5.0"; + version = "2.6.1"; pyproject = true; src = fetchFromGitHub { owner = "wjakob"; repo = "nanobind"; tag = "v${version}"; - hash = "sha256-sH+qZHd9OKDxl2yTAeDh4xLwW64k6nIToyLfd3cR6kE="; + hash = "sha256-1CU5aRhiVPGXLVYZzOM8ELgRwa3hz7kQSwlTYsvFE7s="; fetchSubmodules = true; }; @@ -57,13 +57,6 @@ buildPythonPackage rec { doCheck = false; preCheck = '' - # TODO: added 2.2.0, re-enable on next bump - # https://github.com/wjakob/nanobind/issues/754 - # "generated stubs do not match their references" - # > -import tensorflow.python.framework.ops - # > +import tensorflow - rm tests/test_ndarray_ext.pyi.ref - # build tests make -j $NIX_BUILD_CORES ''; From f5bc547d296ca190e3480b3b6d38d3f9d8b473a9 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Sun, 30 Mar 2025 11:09:30 -0700 Subject: [PATCH 051/107] offrss: unbreak GCC 14, modernize --- pkgs/by-name/of/offrss/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/of/offrss/package.nix b/pkgs/by-name/of/offrss/package.nix index 4bc3eb3a8094..0d60b2d6e3c7 100644 --- a/pkgs/by-name/of/offrss/package.nix +++ b/pkgs/by-name/of/offrss/package.nix @@ -8,7 +8,7 @@ libiconv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "offrss"; version = "1.3"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains: # ld: serve_pdf.o:offrss.h:75: multiple definition of `cgi_url_path'; # offrss.o:offrss.h:75: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = "-fcommon -Wno-error=implicit-function-declaration"; configurePhase = '' @@ -43,16 +43,16 @@ stdenv.mkDerivation rec { ''; src = fetchurl { - url = "http://vicerveza.homeunix.net/~viric/soft/offrss/offrss-${version}.tar.gz"; - sha256 = "1akw1x84jj2m9z60cvlvmz21qwlaywmw18pl7lgp3bj5nw6250p6"; + url = "http://vicerveza.homeunix.net/~viric/soft/offrss/offrss-${finalAttrs.version}.tar.gz"; + hash = "sha256-5oIiDLdFrnEfPfSiwCv3inIcxK+bbgbMT1VISVAPfKo="; }; - meta = with lib; { + meta = { homepage = "http://vicerveza.homeunix.net/~viric/cgi-bin/offrss"; description = "Offline RSS/Atom reader"; - license = licenses.agpl3Plus; + license = lib.licenses.agpl3Plus; maintainers = [ ]; platforms = lib.platforms.linux; mainProgram = "offrss"; }; -} +}) From ae7136730a99b6ca538228b1b10c480117fa591b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Mar 2025 19:02:24 +0000 Subject: [PATCH 052/107] roslyn-ls: 4.14.0-3.25156.1 -> 4.14.0-3.25164.3 --- pkgs/by-name/ro/roslyn-ls/deps.json | 12 ++++++------ pkgs/by-name/ro/roslyn-ls/package.nix | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json index e790854e7a40..8a4b957c48ec 100644 --- a/pkgs/by-name/ro/roslyn-ls/deps.json +++ b/pkgs/by-name/ro/roslyn-ls/deps.json @@ -199,15 +199,15 @@ }, { "pname": "Microsoft.DotNet.Arcade.Sdk", - "version": "9.0.0-beta.25111.5", - "hash": "sha256-gwzSdsu6YfLYxjltDOUouvajClMQ/BW8aiJQlYyxtlk=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25111.5/microsoft.dotnet.arcade.sdk.9.0.0-beta.25111.5.nupkg" + "version": "9.0.0-beta.25161.4", + "hash": "sha256-NrQSPWnG7RlhNMyrqcz4sR0+WWpJpoTrrRtVLkIGFms=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25161.4/microsoft.dotnet.arcade.sdk.9.0.0-beta.25161.4.nupkg" }, { "pname": "Microsoft.DotNet.XliffTasks", - "version": "9.0.0-beta.25111.5", - "hash": "sha256-ZOwHiBzSiJ9PJwLP1iw18sZoxW+78ej+gGg4yt9dei4=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25111.5/microsoft.dotnet.xlifftasks.9.0.0-beta.25111.5.nupkg" + "version": "9.0.0-beta.25161.4", + "hash": "sha256-l4CTmNsxuFP3Bjs2mS1/zdmsb/ZvyHpddTX2HT+MVu4=", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25161.4/microsoft.dotnet.xlifftasks.9.0.0-beta.25161.4.nupkg" }, { "pname": "Microsoft.Extensions.Configuration", diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix index f0ec2eada083..ce314ce8ea8e 100644 --- a/pkgs/by-name/ro/roslyn-ls/package.nix +++ b/pkgs/by-name/ro/roslyn-ls/package.nix @@ -32,18 +32,18 @@ in buildDotnetModule rec { inherit pname dotnet-sdk dotnet-runtime; - vsVersion = "2.69.22"; + vsVersion = "2.70.15"; src = fetchFromGitHub { owner = "dotnet"; repo = "roslyn"; rev = "VSCode-CSharp-${vsVersion}"; - hash = "sha256-z3DDbLFKH5u0w6LswZcghLkkqDYEtCRFNIfoq7N+P2c="; + hash = "sha256-vXRt/scWxekd8U04MGfD4W8aj05H0CqkbIYZy8+0OdU="; }; # versioned independently from vscode-csharp # "roslyn" in here: # https://github.com/dotnet/vscode-csharp/blob/main/package.json - version = "4.14.0-3.25156.1"; + version = "4.14.0-3.25164.3"; projectFile = "src/LanguageServer/${project}/${project}.csproj"; useDotnetFromEnv = true; nugetDeps = ./deps.json; From 26c884c02cdbde31b08b28ab621656b9f50236d0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Mar 2025 21:05:30 +0200 Subject: [PATCH 053/107] python313Packages.lnkparse3: 1.5.0 -> 1.5.1 Diff: https://github.com/Matmaus/LnkParse3/compare/refs/tags/v1.5.0...v1.5.1 Changelog: https://github.com/Matmaus/LnkParse3/blob/1.5.1/CHANGELOG.md --- pkgs/development/python-modules/lnkparse3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lnkparse3/default.nix b/pkgs/development/python-modules/lnkparse3/default.nix index 4c12750e82f3..2f1c74cb7100 100644 --- a/pkgs/development/python-modules/lnkparse3/default.nix +++ b/pkgs/development/python-modules/lnkparse3/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "lnkparse3"; - version = "1.5.0"; + version = "1.5.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Matmaus"; repo = "LnkParse3"; tag = "v${version}"; - hash = "sha256-oyULNRjC0pcVUOeTjjW3g3mB7KySYcwAS+/KwQEIkK4="; + hash = "sha256-ebaKVl7GFoJiyQR7x4AN9Md8dtuYUchaN8ORbUrj5DY="; }; build-system = [ setuptools ]; From 0e2752f61577d32aac10390585a68018c33e6b5e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Mar 2025 21:06:19 +0200 Subject: [PATCH 054/107] python313Packages.mcpadapt: 0.0.16 -> 0.0.18 Diff: https://github.com/grll/mcpadapt/compare/refs/tags/v0.0.16...v0.0.18 Changelog: https://github.com/grll/mcpadapt/releases/tag/v0.0.18 --- pkgs/development/python-modules/mcpadapt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mcpadapt/default.nix b/pkgs/development/python-modules/mcpadapt/default.nix index ccca1e0c5be8..6cf161eb0960 100644 --- a/pkgs/development/python-modules/mcpadapt/default.nix +++ b/pkgs/development/python-modules/mcpadapt/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "mcpadapt"; - version = "0.0.16"; + version = "0.0.18"; pyproject = true; src = fetchFromGitHub { owner = "grll"; repo = "mcpadapt"; tag = "v${version}"; - hash = "sha256-l5noNvg2vQJa0kOPJG78whrnTKkYy1FUfSb9V+ICpAo="; + hash = "sha256-E8A4zjkS3giR6oS5SmVwFwy7g2z3CvZsJBegZ35b41Q="; }; build-system = [ hatchling ]; From 20dd18b4a6401d292777dcf366105681633a3fd3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Mar 2025 21:07:02 +0200 Subject: [PATCH 055/107] python313Packages.pyexploitdb: 0.2.73 -> 0.2.74 Changelog: https://github.com/Hackman238/pyExploitDb/blob/master/ChangeLog.md --- pkgs/development/python-modules/pyexploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index c47f4653f556..cfc4a2e8673b 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.73"; + version = "0.2.74"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-KpbrcCjG8F/Ktka7puh/7rSpEMSf5LvMH+Yd//UbhjQ="; + hash = "sha256-pQRyIv1wu78vNjxl5tt0kI34RvCEycEMMEtaOnlaa10="; }; build-system = [ setuptools ]; From 252be5e0776b104df05e8b4e1e05f58db8fcf3e7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Mar 2025 21:08:08 +0200 Subject: [PATCH 056/107] python313Packages.xiaomi-ble: 0.33.0 -> 0.35.0 Diff: https://github.com/Bluetooth-Devices/xiaomi-ble/compare/refs/tags/v0.33.0...v0.35.0 Changelog: https://github.com/Bluetooth-Devices/xiaomi-ble/releases/tag/v0.35.0 --- pkgs/development/python-modules/xiaomi-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index bf39bf05ae66..b0c8020c06e4 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.33.0"; + version = "0.35.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "xiaomi-ble"; tag = "v${version}"; - hash = "sha256-7/4Ea8IiRPxhgMiazSylYZAmznqIula2yCEUAyIHBBg="; + hash = "sha256-+mXn5R9zRjTPKqzB0vFHSO2+Jx+61K7/Ksp+jmMUDo4="; }; build-system = [ poetry-core ]; From e9cea0adf3d4f607d8887518e50269f3dce1ca5b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Mar 2025 21:09:39 +0200 Subject: [PATCH 057/107] python313Packages.httpx-ws: 0.7.1 -> 0.7.2 Diff: https://github.com/frankie567/httpx-ws/compare/refs/tags/v0.7.1...v0.7.2 Changelog: https://github.com/frankie567/httpx-ws/releases/tag/v0.7.2 --- pkgs/development/python-modules/httpx-ws/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httpx-ws/default.nix b/pkgs/development/python-modules/httpx-ws/default.nix index 6a02e27dab1a..d2277484781e 100644 --- a/pkgs/development/python-modules/httpx-ws/default.nix +++ b/pkgs/development/python-modules/httpx-ws/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "httpx-ws"; - version = "0.7.1"; + version = "0.7.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "frankie567"; repo = "httpx-ws"; tag = "v${version}"; - hash = "sha256-UO9O4d7QfPdIWL4CtlOuwQRsk/9sEFknahDLWIOfeA0="; + hash = "sha256-ixaD7X6V/tUalZbYtic7D9lRqv8yGnwl+j5m832n/hQ="; }; # we don't need to use the hatch-regex-commit plugin From d6dab712e4c50c24481dbed444b7198452a1ed72 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 30 Mar 2025 18:39:01 +0200 Subject: [PATCH 058/107] sops: 3.9.4 -> 3.10.0 https://github.com/getsops/sops/releases/tag/v3.10.0 Upstream bumped to Go 1.24 and dropped 1.22 support Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/so/sops/package.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/so/sops/package.nix b/pkgs/by-name/so/sops/package.nix index 0b34ee99df23..0bfc6df55978 100644 --- a/pkgs/by-name/so/sops/package.nix +++ b/pkgs/by-name/so/sops/package.nix @@ -1,29 +1,24 @@ { lib, - buildGo122Module, + buildGoModule, fetchFromGitHub, installShellFiles, versionCheckHook, nix-update-script, }: -buildGo122Module rec { +buildGoModule rec { pname = "sops"; - version = "3.9.4"; + version = "3.10.0"; src = fetchFromGitHub { owner = "getsops"; repo = pname; tag = "v${version}"; - hash = "sha256-w2RMK1Fl/k8QXV68j0Kc6shtx4vQa07RCnpgHLM8c8Q="; + hash = "sha256-NOZvVL4b7+TVlB6iM4HJDa5PHOjvcN0BXDMOHmqg7lU="; }; - vendorHash = "sha256-wxmSj3QaFChGE+/2my7Oe2mhprwi404izUxteecyggY="; - - postPatch = '' - substituteInPlace go.mod \ - --replace-fail "go 1.22" "go 1.22.7" - ''; + vendorHash = "sha256-I+iwimrNdKABZFP2etZTQJAXKigh+0g/Jhip86Cl5Rg="; subPackages = [ "cmd/sops" ]; From 8589ad4714f731a6c36e67491dca821683afb830 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 30 Mar 2025 21:22:14 +0200 Subject: [PATCH 059/107] perlPackages.TAPParserSourceHandlerpgTAP: 3.36 -> 3.37 Release notes: https://github.com/theory/tap-parser-sourcehandler-pgtap/releases/tag/v3.37 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5294bca52c80..148810eb1e41 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -24128,8 +24128,8 @@ with self; { pname = "TAP-Parser-SourceHandler-pgTAP"; version = "3.36"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DW/DWHEELER/TAP-Parser-SourceHandler-pgTAP-3.36.tar.gz"; - hash = "sha256-B75RUy4GPqxu2OWBUFRw7ryB1VBkQa8tzzK8Dr7pjGc="; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/TAP-Parser-SourceHandler-pgTAP-3.37.tar.gz"; + hash = "sha256-bpKFgUQqHmhxMfe11vT/RLf43N95jS0Ha9zQfYt6WX0="; }; doCheck = !stdenv.hostPlatform.isDarwin; meta = { From 347e71e3e444118a03bb9662fe98514123cd680a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Mar 2025 19:40:08 +0000 Subject: [PATCH 060/107] lakectl: 1.53.0 -> 1.53.1 --- pkgs/by-name/la/lakectl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/la/lakectl/package.nix b/pkgs/by-name/la/lakectl/package.nix index 2af3a75b7672..a771efb9c22c 100644 --- a/pkgs/by-name/la/lakectl/package.nix +++ b/pkgs/by-name/la/lakectl/package.nix @@ -7,18 +7,18 @@ buildGoModule (finalAttrs: { pname = "lakectl"; - version = "1.53.0"; + version = "1.53.1"; src = fetchFromGitHub { owner = "treeverse"; repo = "lakeFS"; tag = "v${finalAttrs.version}"; - hash = "sha256-AYFhkwnlK8RU/HPemJkoZiJ1DCSszIFybJRsUIGhs4g="; + hash = "sha256-kZ7GvrrZq9XAq//jC6sP4uudTJsGJw6/vYXAPs63Wq8="; }; subPackages = [ "cmd/lakectl" ]; proxyVendor = true; - vendorHash = "sha256-p5eHkVbUrcSC4i+R/HGh2nSTIWVkFNiN+TVh10rdWqs="; + vendorHash = "sha256-X7rXEM+8fgbmG+K05KOJp8345muASgnrWGW0jbJ9WSM="; ldflags = [ "-s" From c67e313cd82cadd77b1220a84abca3cc905e033d Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 30 Mar 2025 22:13:51 +0200 Subject: [PATCH 061/107] matrix-sdk-crypto-nodejs: use fetchCargoVendor --- .../ma/matrix-sdk-crypto-nodejs/Cargo.lock | 2309 ----------------- .../ma/matrix-sdk-crypto-nodejs/package.nix | 10 +- 2 files changed, 3 insertions(+), 2316 deletions(-) delete mode 100644 pkgs/by-name/ma/matrix-sdk-crypto-nodejs/Cargo.lock diff --git a/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/Cargo.lock b/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/Cargo.lock deleted file mode 100644 index 9dba9d42911d..000000000000 --- a/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/Cargo.lock +++ /dev/null @@ -1,2309 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aead" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" -dependencies = [ - "crypto-common", - "generic-array", -] - -[[package]] -name = "aes" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b8f9420f797f2d9e935edf629310eb938a0d839f984e25327f3c7eed22300c" -dependencies = [ - "memchr", -] - -[[package]] -name = "allocator-api2" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - -[[package]] -name = "anyhow" -version = "1.0.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" - -[[package]] -name = "arrayref" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -dependencies = [ - "serde", -] - -[[package]] -name = "as_variant" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f38fa22307249f86fb7fad906fcae77f2564caeb56d7209103c551cd1cf4798f" - -[[package]] -name = "assign" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002" - -[[package]] -name = "async-trait" -version = "0.1.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.68" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[package]] -name = "bitflags" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" -dependencies = [ - "serde", -] - -[[package]] -name = "bitmaps" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6" - -[[package]] -name = "blake3" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" -dependencies = [ - "arrayref", - "arrayvec", - "cc", - "cfg-if", - "constant_time_eq", -] - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "block-padding" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bs58" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "bumpalo" -version = "3.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "cbc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" -dependencies = [ - "cipher", -] - -[[package]] -name = "cc" -version = "1.0.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" -dependencies = [ - "libc", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chacha20" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "chacha20poly1305" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" -dependencies = [ - "aead", - "chacha20", - "cipher", - "poly1305", - "zeroize", -] - -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", - "zeroize", -] - -[[package]] -name = "const-oid" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - -[[package]] -name = "const_panic" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b" - -[[package]] -name = "constant_time_eq" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" - -[[package]] -name = "convert_case" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "cpufeatures" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" -dependencies = [ - "libc", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "rand_core", - "typenum", -] - -[[package]] -name = "ctor" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f34ba9a9bcb8645379e9de8cb3ecfcf4d1c85ba66d90deb3259206fa5aa193b" -dependencies = [ - "quote", - "syn 2.0.66", -] - -[[package]] -name = "ctr" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" -dependencies = [ - "cipher", -] - -[[package]] -name = "curve25519-dalek" -version = "4.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" -dependencies = [ - "cfg-if", - "cpufeatures", - "curve25519-dalek-derive", - "digest", - "fiat-crypto", - "platforms", - "rustc_version", - "serde", - "subtle", - "zeroize", -] - -[[package]] -name = "curve25519-dalek-derive" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "date_header" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c03c416ed1a30fbb027ef484ba6ab6f80e1eada675e1a2b92fd673c045a1f1d" - -[[package]] -name = "deadpool" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb84100978c1c7b37f09ed3ce3e5f843af02c2a2c431bae5b19230dad2c1b490" -dependencies = [ - "async-trait", - "deadpool-runtime", - "num_cpus", - "tokio", -] - -[[package]] -name = "deadpool-runtime" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaa37046cc0f6c3cc6090fbdbf73ef0b8ef4cfcc37f6befc0020f63e8cf121e1" -dependencies = [ - "tokio", -] - -[[package]] -name = "deadpool-sqlite" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8010e36e12f3be22543a5e478b4af20aeead9a700dd69581a5e050a070fc22c" -dependencies = [ - "deadpool", - "deadpool-sync", - "rusqlite", -] - -[[package]] -name = "deadpool-sync" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524bc3df0d57e98ecd022e21ba31166c2625e7d3e5bcc4510efaeeab4abcab04" -dependencies = [ - "deadpool-runtime", -] - -[[package]] -name = "der" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" -dependencies = [ - "const-oid", - "der_derive", - "flagset", - "zeroize", -] - -[[package]] -name = "der_derive" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe87ce4529967e0ba1dcf8450bab64d97dfd5010a6256187ffe2e43e6f0e049" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", - "subtle", -] - -[[package]] -name = "ed25519" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" -dependencies = [ - "pkcs8", - "serde", - "signature", -] - -[[package]] -name = "ed25519-dalek" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" -dependencies = [ - "curve25519-dalek", - "ed25519", - "rand_core", - "serde", - "sha2", - "subtle", - "zeroize", -] - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "eyeball" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42482893d982111055ce4b24234d6250396d3785767c6b04cedd84612a0b80fb" -dependencies = [ - "futures-core", - "readlock", - "tracing", -] - -[[package]] -name = "eyeball-im" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "021fab29d9670be5867b16d56a95c29a12c3c1bb654e7d589010a028716d625d" -dependencies = [ - "futures-core", - "imbl", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "fallible-iterator" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - -[[package]] -name = "fiat-crypto" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" - -[[package]] -name = "flagset" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdeb3aa5e95cf9aabc17f060cfa0ced7b83f042390760ca53bf09df9968acaa1" - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "futures-channel" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" -dependencies = [ - "futures-core", -] - -[[package]] -name = "futures-core" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" - -[[package]] -name = "futures-sink" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" - -[[package]] -name = "futures-task" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" - -[[package]] -name = "futures-util" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" -dependencies = [ - "futures-channel", - "futures-core", - "futures-task", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" -dependencies = [ - "cfg-if", - "js-sys", - "libc", - "wasi", - "wasm-bindgen", -] - -[[package]] -name = "gimli" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" - -[[package]] -name = "gloo-timers" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" -dependencies = [ - "ahash", - "allocator-api2", -] - -[[package]] -name = "hashlink" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" -dependencies = [ - "hashbrown", -] - -[[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] -name = "hkdf" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" -dependencies = [ - "hmac", -] - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[package]] -name = "http" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "imbl" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978d142c8028edf52095703af2fad11d6f611af1246685725d6b850634647085" -dependencies = [ - "bitmaps", - "imbl-sized-chunks", - "rand_core", - "rand_xoshiro", - "version_check", -] - -[[package]] -name = "imbl-sized-chunks" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "144006fb58ed787dcae3f54575ff4349755b00ccc99f4b4873860b654be1ed63" -dependencies = [ - "bitmaps", -] - -[[package]] -name = "indexmap" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" -dependencies = [ - "equivalent", - "hashbrown", - "serde", -] - -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "block-padding", - "generic-array", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "js-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "js_int" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d937f95470b270ce8b8950207715d71aa8e153c0d44c6684d59397ed4949160a" -dependencies = [ - "serde", -] - -[[package]] -name = "js_option" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68421373957a1593a767013698dbf206e2b221eefe97a44d98d18672ff38423c" -dependencies = [ - "serde", -] - -[[package]] -name = "konst" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030400e39b2dff8beaa55986a17e0014ad657f569ca92426aafcb5e8e71faee7" -dependencies = [ - "const_panic", - "konst_kernel", - "typewit", -] - -[[package]] -name = "konst_kernel" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3376133edc39f027d551eb77b077c2865a0ef252b2e7d0dd6b6dc303db95d8b5" -dependencies = [ - "typewit", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.155" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if", - "winapi", -] - -[[package]] -name = "libsqlite3-sys" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "log" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" - -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "matrix-pickle" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb521190328c57a2051f70250beb874dc0fac6bcd22b615f7f9700b7b4fb826" -dependencies = [ - "matrix-pickle-derive", - "thiserror", -] - -[[package]] -name = "matrix-pickle-derive" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fb3c7231cbb7fbbc50871615edebf65183b382cdaa1fe21c5e88a12617de8e" -dependencies = [ - "proc-macro-crate", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "matrix-sdk-base" -version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=931c5649420adb071caf1abafc7964758487e472#931c5649420adb071caf1abafc7964758487e472" -dependencies = [ - "as_variant", - "async-trait", - "bitflags", - "eyeball", - "eyeball-im", - "futures-util", - "matrix-sdk-common", - "matrix-sdk-store-encryption", - "once_cell", - "ruma", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "matrix-sdk-common" -version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=931c5649420adb071caf1abafc7964758487e472#931c5649420adb071caf1abafc7964758487e472" -dependencies = [ - "async-trait", - "futures-core", - "futures-util", - "gloo-timers", - "instant", - "ruma", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", - "tracing-subscriber", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "matrix-sdk-crypto" -version = "0.7.1" -source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=931c5649420adb071caf1abafc7964758487e472#931c5649420adb071caf1abafc7964758487e472" -dependencies = [ - "aes", - "as_variant", - "async-trait", - "bs58", - "byteorder", - "cbc", - "cfg-if", - "ctr", - "eyeball", - "futures-core", - "futures-util", - "hkdf", - "hmac", - "itertools", - "js_option", - "matrix-sdk-common", - "matrix-sdk-qrcode", - "pbkdf2", - "rand", - "rmp-serde", - "ruma", - "serde", - "serde_json", - "sha2", - "subtle", - "thiserror", - "time", - "tokio", - "tokio-stream", - "tracing", - "url", - "vodozemac", - "zeroize", -] - -[[package]] -name = "matrix-sdk-crypto-nodejs" -version = "0.0.0" -dependencies = [ - "ahash", - "http", - "matrix-sdk-common", - "matrix-sdk-crypto", - "matrix-sdk-sqlite", - "napi", - "napi-build", - "napi-derive", - "serde_json", - "tracing-subscriber", - "zeroize", -] - -[[package]] -name = "matrix-sdk-qrcode" -version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=931c5649420adb071caf1abafc7964758487e472#931c5649420adb071caf1abafc7964758487e472" -dependencies = [ - "byteorder", - "qrcode", - "ruma-common", - "thiserror", - "vodozemac", -] - -[[package]] -name = "matrix-sdk-sqlite" -version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=931c5649420adb071caf1abafc7964758487e472#931c5649420adb071caf1abafc7964758487e472" -dependencies = [ - "async-trait", - "deadpool-sqlite", - "itertools", - "matrix-sdk-base", - "matrix-sdk-crypto", - "matrix-sdk-store-encryption", - "rmp-serde", - "ruma", - "rusqlite", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", - "vodozemac", -] - -[[package]] -name = "matrix-sdk-store-encryption" -version = "0.7.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk?rev=931c5649420adb071caf1abafc7964758487e472#931c5649420adb071caf1abafc7964758487e472" -dependencies = [ - "base64", - "blake3", - "chacha20poly1305", - "hmac", - "pbkdf2", - "rand", - "rmp-serde", - "serde", - "serde_json", - "sha2", - "thiserror", - "zeroize", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "napi" -version = "2.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ede2d12cd6fce44da537a4be1f5510c73be2506c2e32dfaaafd1f36968f3a0e" -dependencies = [ - "bitflags", - "ctor", - "napi-derive", - "napi-sys", - "once_cell", - "tokio", -] - -[[package]] -name = "napi-build" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "882a73d9ef23e8dc2ebbffb6a6ae2ef467c0f18ac10711e4cc59c5485d41df0e" - -[[package]] -name = "napi-derive" -version = "2.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da1c6a8fa84d549aa8708fcd062372bf8ec6e849de39016ab921067d21bde367" -dependencies = [ - "cfg-if", - "convert_case", - "napi-derive-backend", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "napi-derive-backend" -version = "1.0.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20bbc7c69168d06a848f925ec5f0e0997f98e8c8d4f2cc30157f0da51c009e17" -dependencies = [ - "convert_case", - "once_cell", - "proc-macro2", - "quote", - "regex", - "semver", - "syn 1.0.109", -] - -[[package]] -name = "napi-sys" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "166b5ef52a3ab5575047a9fe8d4a030cdd0f63c96f071cd6907674453b07bae3" -dependencies = [ - "libloading", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - -[[package]] -name = "num-traits" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "object" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "pbkdf2" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" -dependencies = [ - "digest", - "hmac", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pin-project-lite" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkcs7" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d79178be066405e0602bf3035946edef6b11b3f9dde46dfe5f8bfd7dea4b77e7" -dependencies = [ - "der", - "spki", - "x509-cert", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der", - "spki", -] - -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "platforms" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" - -[[package]] -name = "poly1305" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" -dependencies = [ - "cpufeatures", - "opaque-debug", - "universal-hash", -] - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "proc-macro-crate" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" -dependencies = [ - "toml_edit 0.21.1", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "prost" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-derive" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" -dependencies = [ - "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "qrcode" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e719ca51966ff9f5a8436edb00d6115b3c606a0bb27c8f8ca74a38ff2b036d" - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_xoshiro" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" -dependencies = [ - "rand_core", -] - -[[package]] -name = "readlock" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7b323e7196daa571c8584de958be19e92941c41f845776fe06babfe8fa280a2" - -[[package]] -name = "regex" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata 0.3.6", - "regex-syntax 0.7.4", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", -] - -[[package]] -name = "regex-automata" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.7.4", -] - -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - -[[package]] -name = "regex-syntax" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" - -[[package]] -name = "rmp" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" -dependencies = [ - "byteorder", - "num-traits", - "paste", -] - -[[package]] -name = "rmp-serde" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" -dependencies = [ - "byteorder", - "rmp", - "serde", -] - -[[package]] -name = "ruma" -version = "0.10.1" -source = "git+https://github.com/ruma/ruma?rev=75e8829bec0b7bc5332860e1fb2df658d5c71d66#75e8829bec0b7bc5332860e1fb2df658d5c71d66" -dependencies = [ - "assign", - "js_int", - "js_option", - "ruma-client-api", - "ruma-common", - "ruma-events", - "web-time", -] - -[[package]] -name = "ruma-client-api" -version = "0.18.0" -source = "git+https://github.com/ruma/ruma?rev=75e8829bec0b7bc5332860e1fb2df658d5c71d66#75e8829bec0b7bc5332860e1fb2df658d5c71d66" -dependencies = [ - "as_variant", - "assign", - "bytes", - "date_header", - "http", - "js_int", - "js_option", - "maplit", - "ruma-common", - "ruma-events", - "serde", - "serde_html_form", - "serde_json", - "thiserror", - "url", - "web-time", -] - -[[package]] -name = "ruma-common" -version = "0.13.0" -source = "git+https://github.com/ruma/ruma?rev=75e8829bec0b7bc5332860e1fb2df658d5c71d66#75e8829bec0b7bc5332860e1fb2df658d5c71d66" -dependencies = [ - "as_variant", - "base64", - "bytes", - "form_urlencoded", - "getrandom", - "http", - "indexmap", - "js-sys", - "js_int", - "konst", - "percent-encoding", - "rand", - "regex", - "ruma-identifiers-validation", - "ruma-macros", - "serde", - "serde_html_form", - "serde_json", - "thiserror", - "time", - "tracing", - "url", - "uuid", - "web-time", - "wildmatch", -] - -[[package]] -name = "ruma-events" -version = "0.28.1" -source = "git+https://github.com/ruma/ruma?rev=75e8829bec0b7bc5332860e1fb2df658d5c71d66#75e8829bec0b7bc5332860e1fb2df658d5c71d66" -dependencies = [ - "as_variant", - "indexmap", - "js_int", - "js_option", - "percent-encoding", - "regex", - "ruma-common", - "ruma-identifiers-validation", - "ruma-macros", - "serde", - "serde_json", - "thiserror", - "tracing", - "url", - "wildmatch", -] - -[[package]] -name = "ruma-identifiers-validation" -version = "0.9.5" -source = "git+https://github.com/ruma/ruma?rev=75e8829bec0b7bc5332860e1fb2df658d5c71d66#75e8829bec0b7bc5332860e1fb2df658d5c71d66" -dependencies = [ - "js_int", - "thiserror", -] - -[[package]] -name = "ruma-macros" -version = "0.13.0" -source = "git+https://github.com/ruma/ruma?rev=75e8829bec0b7bc5332860e1fb2df658d5c71d66#75e8829bec0b7bc5332860e1fb2df658d5c71d66" -dependencies = [ - "once_cell", - "proc-macro-crate", - "proc-macro2", - "quote", - "ruma-identifiers-validation", - "serde", - "syn 2.0.66", - "toml", -] - -[[package]] -name = "rusqlite" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" -dependencies = [ - "bitflags", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "smallvec", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "semver" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" - -[[package]] -name = "serde" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_bytes" -version = "0.11.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "serde_html_form" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde65b75f2603066b78d6fa239b2c07b43e06ead09435f60554d3912962b4a3c" -dependencies = [ - "form_urlencoded", - "indexmap", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_json" -version = "1.0.117" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" -dependencies = [ - "serde", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "rand_core", -] - -[[package]] -name = "slab" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" - -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der", -] - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "thiserror" -version = "1.0.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa", - "num-conv", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3ce25f50619af8b0aec2eb23deebe84249e19e2ddd393a6e16e3300a6dadfd" -dependencies = [ - "backtrace", - "num_cpus", - "pin-project-lite", -] - -[[package]] -name = "tokio-stream" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", - "tokio-util", -] - -[[package]] -name = "tokio-util" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "toml" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.14", -] - -[[package]] -name = "toml_datetime" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.7", -] - -[[package]] -name = "toml_edit" -version = "0.22.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.11", -] - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "time", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "typewit" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5cee357cc77d1e02f10a3e6c4e13b8462fafab05998b62d331b7d9485589ff" - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-ident" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "universal-hash" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" -dependencies = [ - "crypto-common", - "subtle", -] - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "uuid" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" -dependencies = [ - "getrandom", - "wasm-bindgen", -] - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "vodozemac" -version = "0.6.0" -source = "git+https://github.com/matrix-org/vodozemac/?rev=4ef989c6a8eba0bc809e285a081c56320a9bbf1e#4ef989c6a8eba0bc809e285a081c56320a9bbf1e" -dependencies = [ - "aes", - "arrayvec", - "base64", - "cbc", - "chacha20poly1305", - "curve25519-dalek", - "ed25519-dalek", - "getrandom", - "hkdf", - "hmac", - "matrix-pickle", - "pkcs7", - "prost", - "rand", - "serde", - "serde_bytes", - "serde_json", - "sha2", - "subtle", - "thiserror", - "x25519-dalek", - "zeroize", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.66", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" - -[[package]] -name = "web-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-time" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "wildmatch" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee583bdc5ff1cf9db20e9db5bb3ff4c3089a8f6b8b31aff265c9aba85812db86" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -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 = "winnow" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f495880723d0999eb3500a9064d8dbcf836460b24c17df80ea7b5794053aac" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c52728401e1dc672a56e81e593e912aa54c78f40246869f78359a2bf24d29d" -dependencies = [ - "memchr", -] - -[[package]] -name = "x25519-dalek" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" -dependencies = [ - "curve25519-dalek", - "rand_core", - "serde", - "zeroize", -] - -[[package]] -name = "x509-cert" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1301e935010a701ae5f8655edc0ad17c44bad3ac5ce8c39185f75453b720ae94" -dependencies = [ - "const-oid", - "der", - "spki", -] - -[[package]] -name = "zerocopy" -version = "0.7.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "zeroize" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] diff --git a/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/package.nix b/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/package.nix index 093d3d7a2133..a9d7ab36dd76 100644 --- a/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/package.nix +++ b/pkgs/by-name/ma/matrix-sdk-crypto-nodejs/package.nix @@ -21,13 +21,9 @@ stdenv.mkDerivation rec { hash = "sha256-g86RPfhF9XHpbXhHRbyhl920VazCrQyRQrYV6tVCHy4="; }; - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; - outputHashes = { - "matrix-sdk-base-0.7.0" = "sha256-nCiG4T/MB7gvGrmadKOEbh8+54081PHee9Bm8oY/nl0="; - "ruma-0.10.1" = "sha256-Yc5RKk4aRjNIoQsMl30fFehTDCkRO9VvenAvLoVHzXo="; - "vodozemac-0.6.0" = "sha256-jJgrJJ0SFcy2oRRZ3ubuKnM2pLO8Tx6NyXordWJjz8o="; - }; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + hash = "sha256-5+nW5g9oxe4L39wJUkSuP3ul5yH8V+E7IdhQVfvzhNk="; }; nativeBuildInputs = [ From fd0345dbb64e24f3a4da03c9502f9389d8bdc6a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Mar 2025 17:46:58 +0000 Subject: [PATCH 062/107] narsil: 7c20b01e055491e86a44201504e8d36873ef1822 -> af7c8c1b33ed0f331710c8ac3ad4a63ad37faacc --- pkgs/by-name/na/narsil/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/narsil/package.nix b/pkgs/by-name/na/narsil/package.nix index 82b97f698a8e..4ecf96e4bc79 100644 --- a/pkgs/by-name/na/narsil/package.nix +++ b/pkgs/by-name/na/narsil/package.nix @@ -14,13 +14,13 @@ }: stdenv.mkDerivation rec { pname = "narsil"; - version = "7c20b01e055491e86a44201504e8d36873ef1822"; + version = "af7c8c1b33ed0f331710c8ac3ad4a63ad37faacc"; src = fetchFromGitHub { owner = "NickMcConnell"; repo = "NarSil"; rev = version; - hash = "sha256-6J9WCWXhKiTRLiH08DTGzAXe8QZFQOLYJkfNVONgWU0="; + hash = "sha256-w/rXKD66Kx+XE1ItOwurf5XWE02OHirofVMUQqpf6WQ="; }; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; }; From 0dcb1d02c371c7a6642c6d4096ce0a8b0aeacfd0 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 30 Mar 2025 22:43:52 +0200 Subject: [PATCH 063/107] narsil: fix version --- pkgs/by-name/na/narsil/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/na/narsil/package.nix b/pkgs/by-name/na/narsil/package.nix index 4ecf96e4bc79..76d3ac329ad9 100644 --- a/pkgs/by-name/na/narsil/package.nix +++ b/pkgs/by-name/na/narsil/package.nix @@ -14,16 +14,16 @@ }: stdenv.mkDerivation rec { pname = "narsil"; - version = "af7c8c1b33ed0f331710c8ac3ad4a63ad37faacc"; + version = "1.4.0-48-gaf7c8c1b3"; src = fetchFromGitHub { owner = "NickMcConnell"; repo = "NarSil"; - rev = version; + tag = version; hash = "sha256-w/rXKD66Kx+XE1ItOwurf5XWE02OHirofVMUQqpf6WQ="; }; - passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; }; + passthru.updateScript = nix-update-script { }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = From e69411fb2b07caf78b43fdac9e77b114b63a0aeb Mon Sep 17 00:00:00 2001 From: emaryn Date: Mon, 31 Mar 2025 04:58:28 +0800 Subject: [PATCH 064/107] vscode-extensions-update: improve --- .../vscode_extensions_batch_update.py | 117 +++++++++ .../vscode_extensions_update.py | 227 +++++++++++++----- 2 files changed, 289 insertions(+), 55 deletions(-) create mode 100755 pkgs/by-name/vs/vscode-extensions-update/vscode_extensions_batch_update.py diff --git a/pkgs/by-name/vs/vscode-extensions-update/vscode_extensions_batch_update.py b/pkgs/by-name/vs/vscode-extensions-update/vscode_extensions_batch_update.py new file mode 100755 index 000000000000..057065ace59f --- /dev/null +++ b/pkgs/by-name/vs/vscode-extensions-update/vscode_extensions_batch_update.py @@ -0,0 +1,117 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python3 -p nix python3 python3Packages.loguru nix-search-tv vscode-extensions-update gitMinimal + +import argparse +import subprocess + +from loguru import logger + + +class VSCodeExtensionBatchUpdater: + # Extensions to be skipped + _excluded_extensions = [ + # wrong upstream constraint: 0.10.x + "vscode-extensions.ms-vscode.theme-tomorrowkit", + "vscode-extensions.richie5um2.snake-trail", + # not supported + "vscode-extensions.ms-ceintl.vscode-language-pack-cs", + "vscode-extensions.ms-ceintl.vscode-language-pack-de", + "vscode-extensions.ms-ceintl.vscode-language-pack-es", + "vscode-extensions.ms-ceintl.vscode-language-pack-fr", + "vscode-extensions.ms-ceintl.vscode-language-pack-it", + "vscode-extensions.ms-ceintl.vscode-language-pack-ja", + "vscode-extensions.ms-ceintl.vscode-language-pack-ko", + "vscode-extensions.ms-ceintl.vscode-language-pack-pt-br", + "vscode-extensions.ms-ceintl.vscode-language-pack-qps-ploc", + "vscode-extensions.ms-ceintl.vscode-language-pack-ru", + "vscode-extensions.ms-ceintl.vscode-language-pack-tr", + "vscode-extensions.ms-ceintl.vscode-language-pack-zh-hans", + "vscode-extensions.ms-ceintl.vscode-language-pack-zh-hant", + ] + + # Unable to determine the correct file location + _extension_file_map = { + "vscode-extensions.hashicorp.terraform": "pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix", + "vscode-extensions.betterthantomorrow.calva": "pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix", + } + + def __init__(self): + self.parser = argparse.ArgumentParser( + description="Batch update VSCode extensions" + ) + # By default, update command skips extensions with updateScript or need '--platforms' + self.parser.add_argument( + "--platforms", + action="store_true", + help="add '--platforms' to update command from some extensions", + ) + self.platforms = self.parser.parse_args().platforms + + def execute_command( + self, command, env: dict[str, str] = None, shell: bool = False + ) -> str: + logger.debug("Executing command: {} (shell={})", command, shell) + return subprocess.run( + command, + check=True, + capture_output=True, + text=True, + env=env, + shell=shell, + ).stdout.strip() + + def _get_extension_list(self) -> list[str]: + # Get extension list from nix-search-tv output + command = "nix-search-tv print | grep '^nixpkgs/ vscode-extensions\\.' | cut -d' ' -f2-" + output = self.execute_command(command, shell=True) + extension_list = output.splitlines() + logger.info("Found {} extensions: {}", len(extension_list), extension_list) + return extension_list + + def _has_update_script(self, extension: str) -> bool: + try: + result = self._get_nix_attribute(f"{extension}.updateScript") + return "not found" not in result + except subprocess.CalledProcessError: + return False + + def _has_platform_source(self, extension: str) -> bool: + source_url = self._get_nix_attribute(f"{extension}.src.url") + return "targetPlatform=" in source_url + + def _get_nix_attribute(self, attribute: str) -> str: + return self.execute_command(["nix", "eval", "--raw", "-f", ".", attribute]) + + def _get_extension_filename(self, extension: str) -> str | None: + return self._extension_file_map.get(extension) + + def _update_extension(self, extension: str) -> None: + logger.info("Updating extension: {}", extension) + if extension in self._excluded_extensions: + return + try: + if self._has_update_script(extension): + return + update_command = ["vscode-extensions-update", extension, "--commit"] + if self._has_platform_source(extension): + if self.platforms: + update_command.append("--platforms") + else: + return + filename = self._get_extension_filename(extension) + if filename: + update_command.extend(["--override-filename", filename]) + self.execute_command(update_command) + logger.info("Updated extension: {}", extension) + except subprocess.CalledProcessError: + logger.error("Failed to update extension: {}", extension) + self.execute_command(["git", "restore", "."]) + + def run(self) -> None: + for extension in self._get_extension_list(): + self._update_extension(extension) + + +if __name__ == "__main__": + updater = VSCodeExtensionBatchUpdater() + updater.run() diff --git a/pkgs/by-name/vs/vscode-extensions-update/vscode_extensions_update.py b/pkgs/by-name/vs/vscode-extensions-update/vscode_extensions_update.py index 3819a9df6d67..a8d8cbf17e2c 100755 --- a/pkgs/by-name/vs/vscode-extensions-update/vscode_extensions_update.py +++ b/pkgs/by-name/vs/vscode-extensions-update/vscode_extensions_update.py @@ -1,21 +1,24 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python3 -p nix python3 nodePackages.semver vsce nix-update gitMinimal +#! nix-shell -i python3 -p nix python3 python3Packages.loguru nodePackages.semver vsce nix-update gitMinimal coreutils common-updater-scripts import argparse import json import os +import re import subprocess import sys +from loguru import logger + class VSCodeExtensionUpdater: """ - A class to update VSCode extension version in nixpkgs. + A class to update VSCode extension version. """ def __init__(self): self.parser = argparse.ArgumentParser( - description="Update VSCode extension version in nixpkgs." + description="Update VSCode extension version." ) self.parser.add_argument( "attribute", @@ -42,7 +45,7 @@ class VSCodeExtensionUpdater: self.args = self.parser.parse_args() self.attribute_path = self.args.attribute if not self.attribute_path: - print("Error: Attribute path is required.", file=sys.stderr) + logger.error("Error: Attribute path is required.") sys.exit(1) self.target_vscode_version = self._get_nix_vscode_version() self.current_version = self._get_nix_vscode_extension_version() @@ -58,13 +61,19 @@ class VSCodeExtensionUpdater: self.nix_systems = self._get_nix_vscode_extension_platforms() or [ self.nix_system ] - if not self.args.platforms and self.nix_system in self.nix_systems: - self.nix_systems = [self.nix_system] - else: - self.nix_systems = self.nix_systems[:1] - print(f"VSCode version: {self.target_vscode_version}") - print(f"Extension Marketplace ID: {self.extension_marketplace_id}") - print(f"Extension Current Version: {self.current_version}") + if not self.args.platforms: + self.nix_systems = ( + [self.nix_system] + if self.nix_system in self.nix_systems + else self.nix_systems[:1] + ) + if self.nix_system in self.nix_systems: + self.nix_systems.remove(self.nix_system) + self.nix_systems.insert(0, self.nix_system) + self.supported_nix_systems = self.get_supported_nix_systems() + logger.info(f"VSCode version: {self.target_vscode_version}") + logger.info(f"Extension Marketplace ID: {self.extension_marketplace_id}") + logger.info(f"Extension Current Version: {self.current_version}") def execute_command( self, commandline: list[str], env: dict[str, str] = None @@ -72,6 +81,7 @@ class VSCodeExtensionUpdater: """ Executes a shell command and returns its output. """ + logger.debug("Executing command: {}", commandline) return subprocess.run( commandline, check=True, @@ -92,6 +102,51 @@ class VSCodeExtensionUpdater: """ return self._get_nix_attribute("system") + def get_supported_nix_systems(self) -> list[str]: + nix_config = self.execute_command(["nix", "config", "show"]) + system = None + extra_platforms = [] + for line in nix_config.splitlines(): + if "=" not in line: + continue + key, value = line.split("=", 1) + key = key.strip() + value = value.strip() + if key == "system": + system = value + elif key == "extra-platforms": + extra_platforms = value.strip("[]").replace('"', "").split() + return ([system] if system is not None else []) + extra_platforms + + def _get_nix_vscode_extension_src_hash(self, system: str) -> str: + url = self.execute_command( + [ + "nix", + "eval", + "--raw", + "-f", + ".", + f"{self.attribute_path}.src.url", + "--system", + system, + ] + ) + if "warning" not in url: + sha256 = self.execute_command(["nix-prefetch-url", url]) + hash = self.execute_command( + [ + "nix", + "hash", + "convert", + "--to", + "sri", + "--hash-algo", + "sha256", + sha256, + ] + ) + return hash + def get_target_platform(self, nix_system: str) -> str: """ Retrieves the VS Code targetPlatform variable based on the Nix system. @@ -108,9 +163,8 @@ class VSCodeExtensionUpdater: try: return platform_mapping[nix_system] except KeyError: - print( - f"Error: Unknown Nix system '{nix_system}'. Cannot determine targetPlatform.", - file=sys.stderr, + logger.error( + f"Error: Unknown Nix system '{nix_system}'. Cannot determine targetPlatform." ) sys.exit(1) @@ -166,25 +220,10 @@ class VSCodeExtensionUpdater: """ command = ["vsce", "show", extension_id, "--json"] try: - with subprocess.Popen( - command, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - text=True, - ) as proc: - data = json.load(proc.stdout) - proc.wait() - if proc.returncode != 0: - err = proc.stderr.read() - raise subprocess.CalledProcessError( - proc.returncode, command, output=err - ) - return data - except json.JSONDecodeError: - print( - "Error: Couldn’t decode JSON response from VSCode marketplace; maybe the extension is not available?", - file=sys.stderr, - ) + output = self.execute_command(command) + return json.loads(output) + except (json.JSONDecodeError, subprocess.CalledProcessError) as e: + logger.exception(e) sys.exit(1) def find_compatible_extension_version( @@ -207,7 +246,7 @@ class VSCodeExtensionUpdater: None, ) if candidate_pre_release and not self.allow_pre_release: - print(f"Skipping PreRelease version {candidate_version}") + logger.debug(f"Skipping PreRelease version {candidate_version}") continue engine_version_constraint = next( ( @@ -218,9 +257,12 @@ class VSCodeExtensionUpdater: None, ) if engine_version_constraint: - print( + logger.debug( f"Testing extension version: {candidate_version} with VSCode {self.target_vscode_version} (constraint: {engine_version_constraint})" ) + engine_version_constraint = self.replace_version_symbol( + engine_version_constraint + ) try: self.execute_command( [ @@ -230,22 +272,70 @@ class VSCodeExtensionUpdater: engine_version_constraint, ] ) - - print(f"Compatible version found: {candidate_version}") + logger.info(f"Compatible version found: {candidate_version}") return candidate_version except (ValueError, subprocess.CalledProcessError): - print( + logger.debug( f"Version {candidate_version} is not compatible with VSCode {self.target_vscode_version} (constraint: {engine_version_constraint})." ) continue return candidate_version else: - print( - "Error: not found compatible version.", - file=sys.stderr, - ) + logger.error("Error: not found compatible version.") sys.exit(1) + def replace_version_symbol(self, version: str) -> str: + version = re.sub(r"^\^", ">=", version) + return version + + def update_version_for_default_nix(self, content: str, new_version: str): + target_name = self.attribute_path.removeprefix("vscode-extensions.") + pattern = re.compile( + rf"{re.escape(target_name)}\s*=\s*buildVscodeMarketplaceExtension\s*\{{", + re.MULTILINE, + ) + match = pattern.search(content) + if not match: + raise ValueError("Target block not found.") + brace_start = content.find("{", match.end() - 1) + if brace_start == -1: + raise ValueError("Opening brace not found.") + count = 0 + pos = brace_start + text_len = len(content) + while pos < text_len: + if content[pos] == "{": + count += 1 + elif content[pos] == "}": + count -= 1 + if count == 0: + break + pos += 1 + if count != 0: + raise ValueError("Braces mismatch.") + block_end = pos + block_text = content[brace_start : block_end + 1] + version_pattern = re.compile(r'(version\s*=\s*")([^"]+)(";)') + + def repl(m): + match_version = m.group(2) + if self.current_version == match_version: + return f"{m.group(1)}{new_version}{m.group(3)}" + return m.group(0) + + new_block_text, count_sub = version_pattern.subn(repl, block_text) + if count_sub == 0: + raise ValueError("No version field updated.") + updated_content = ( + content[:brace_start] + new_block_text + content[block_end + 1 :] + ) + with open( + self.override_filename, + "w", + encoding="utf-8", + ) as f: + f.write(updated_content) + def run_nix_update(self, new_version: str, system: str) -> None: """ Builds and executes the nix-update command. @@ -272,16 +362,44 @@ class VSCodeExtensionUpdater: self.override_filename = ( "pkgs/applications/editors/vscode/extensions/default.nix" ) - update_command = [ - "nix-update", - self.attribute_path, - "--version", - new_version, - "--override-filename", - self.override_filename, - "--system", - system, - ] + if ( + new_version != "skip" + and "pkgs/applications/editors/vscode/extensions/default.nix" + in self.override_filename + ): + with logger.catch(exception=(IOError, ValueError)): + with open( + self.override_filename, + "r", + encoding="utf-8", + ) as f: + content = f.read() + if content.count(self.current_version) > 1: + self.update_version_for_default_nix(content, new_version) + new_version = "skip" + if system not in self.supported_nix_systems: + hash = self._get_nix_vscode_extension_src_hash(system) + update_command = [ + "update-source-version", + self.attribute_path, + self.new_version, + hash, + f"--system={system}", + "--ignore-same-version", + "--ignore-same-hash", + f"--file={self.override_filename}", + ] + else: + update_command = [ + "nix-update", + self.attribute_path, + "--version", + new_version, + "--override-filename", + self.override_filename, + "--system", + system, + ] self.execute_command(update_command) def run(self): @@ -289,7 +407,7 @@ class VSCodeExtensionUpdater: self.extension_marketplace_id ) available_versions = marketplace_data.get("versions", []) - print( + logger.info( f"Total versions found for {self.extension_marketplace_id}: {len(available_versions)}" ) self.new_version = self.find_compatible_extension_version( @@ -300,9 +418,8 @@ class VSCodeExtensionUpdater: ["semver", self.current_version, "-r", f"<{self.new_version}"] ) except subprocess.CalledProcessError: - print("Already up to date or new version is older!") + logger.info("Already up to date or new version is older!") sys.exit(0) - print(f"Selected extension version from Marketplace: {self.new_version}") for i, system in enumerate(self.nix_systems): version = self.new_version if i == 0 else "skip" self.run_nix_update(version, system) From da9d6f32406ffc452c5c2adbf89e6ad9d50e9a0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Mar 2025 14:27:23 +0000 Subject: [PATCH 065/107] oneDNN: 3.7 -> 3.7.2 --- pkgs/by-name/on/oneDNN/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/on/oneDNN/package.nix b/pkgs/by-name/on/oneDNN/package.nix index e921495d3849..97265c7d5bd5 100644 --- a/pkgs/by-name/on/oneDNN/package.nix +++ b/pkgs/by-name/on/oneDNN/package.nix @@ -10,13 +10,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation (finalAttrs: { pname = "oneDNN"; - version = "3.7"; + version = "3.7.2"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${finalAttrs.version}"; - hash = "sha256-KUQRdsmEFC9hgBF0O8+Ltb2wC4QzjLjMdfxZCi3Dy2A="; + hash = "sha256-buOrJOPI2Fe5fqyaFjC+Wai4BX2RhQ+41+VR2Kyi8+A="; }; outputs = [ "out" "dev" "doc" ]; From 493f1e3b8be80df5ecd1ee4566de63ca352af73f Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 31 Mar 2025 00:32:46 +0200 Subject: [PATCH 066/107] nixVersions.nix_2_26: Improve docs --- .../nix/vendor/2_26/packaging/components.nix | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/vendor/2_26/packaging/components.nix b/pkgs/tools/package-management/nix/vendor/2_26/packaging/components.nix index f65370e12490..6b26b225ff4f 100644 --- a/pkgs/tools/package-management/nix/vendor/2_26/packaging/components.nix +++ b/pkgs/tools/package-management/nix/vendor/2_26/packaging/components.nix @@ -240,6 +240,8 @@ in /** Apply an extension function (i.e. overlay-shaped) to all component derivations. + + Single argument: the extension function to apply (finalAttrs: prevAttrs: { ... }) */ overrideAllMesonComponents = f: @@ -253,7 +255,11 @@ in Provide an alternate source. This allows the expressions to be vendored without copying the sources, but it does make the build non-granular; all components will use a complete source. - Packaging expressions will be ignored. + Filesets in the packaging expressions will be ignored. + + Single argument: the source to use. + + See also `appendPatches` */ overrideSource = src: @@ -294,6 +300,10 @@ in This affects all components. Changes to the packaging expressions will be ignored. + + Single argument: list of patches to apply + + See also `overrideSource` */ appendPatches = patches: @@ -367,7 +377,7 @@ in nix-perl-bindings = callPackage ../src/perl/package.nix { }; nix-everything = callPackage ../packaging/everything.nix { } // { - # Note: no `passthru.overrideAllMesonComponents` + # Note: no `passthru.overrideAllMesonComponents` etc # This would propagate into `nix.overrideAttrs f`, but then discard # `f` when `.overrideAllMesonComponents` is used. # Both "methods" should be views on the same fixpoint overriding mechanism @@ -375,6 +385,8 @@ in # two-fixpoint solution. /** Apply an extension function (i.e. overlay-shaped) to all component derivations, and return the nix package. + + Single argument: the extension function to apply (finalAttrs: prevAttrs: { ... }) */ overrideAllMesonComponents = f: (scope.overrideAllMesonComponents f).nix-everything; @@ -383,6 +395,10 @@ in This affects all components. Changes to the packaging expressions will be ignored. + + Single argument: list of patches to apply + + See also `overrideSource` */ appendPatches = ps: (scope.appendPatches ps).nix-everything; @@ -390,7 +406,11 @@ in Provide an alternate source. This allows the expressions to be vendored without copying the sources, but it does make the build non-granular; all components will use a complete source. - Packaging expressions will be ignored. + Filesets in the packaging expressions will be ignored. + + Single argument: the source to use. + + See also `appendPatches` */ overrideSource = src: (scope.overrideSource src).nix-everything; From e1b8acf7ca9c56164dfe6f22dbdc2f81c801c50f Mon Sep 17 00:00:00 2001 From: Stefano De Vuono Date: Sun, 30 Mar 2025 15:42:16 -0700 Subject: [PATCH 067/107] change replace to replace-fail --- .../editors/jupyter-kernels/xeus-cling/xeus-cling.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix b/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix index 9202704a3555..af0c5cce88f3 100644 --- a/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix +++ b/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix @@ -88,11 +88,11 @@ clangStdenv.mkDerivation rec { postPatch = '' substituteInPlace src/xmagics/executable.cpp \ - --replace "getDataLayout" "getDataLayoutString" + --replace-fail "getDataLayout" "getDataLayoutString" substituteInPlace src/xmagics/execution.cpp \ - --replace "simplisticCastAs" "castAs" + --replace-fail "simplisticCastAs" "castAs" substituteInPlace src/xmime_internal.hpp \ - --replace "code.str()" "code.str().str()" + --replace-fail "code.str()" "code.str().str()" ''; dontStrip = debug; From d74838df79a28007d34bc0c84beeecf78d864687 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 31 Mar 2025 00:33:57 +0200 Subject: [PATCH 068/107] nixVersions.nix_2_26: Add .overrideScope --- .../nix/vendor/2_26/packaging/components.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/tools/package-management/nix/vendor/2_26/packaging/components.nix b/pkgs/tools/package-management/nix/vendor/2_26/packaging/components.nix index 6b26b225ff4f..77cf9c9a5065 100644 --- a/pkgs/tools/package-management/nix/vendor/2_26/packaging/components.nix +++ b/pkgs/tools/package-management/nix/vendor/2_26/packaging/components.nix @@ -414,5 +414,17 @@ in */ overrideSource = src: (scope.overrideSource src).nix-everything; + /** + Override any internals of the Nix package set. + + Single argument: the extension function to apply to the package set (finalScope: prevScope: { ... }) + + Example: + ``` + overrideScope (finalScope: prevScope: { aws-sdk-cpp = null; }) + ``` + */ + overrideScope = f: (scope.overrideScope f).nix-everything; + }; } From bb984408d5c640d4b1eb9f5cc6cbfa500b96a798 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 31 Mar 2025 00:34:37 +0200 Subject: [PATCH 069/107] lib/tests/release.nix: Use nix.overrideScope for >=2.26 --- lib/tests/nix-for-tests.nix | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/lib/tests/nix-for-tests.nix b/lib/tests/nix-for-tests.nix index cac9400d7b7d..96c01241773a 100644 --- a/lib/tests/nix-for-tests.nix +++ b/lib/tests/nix-for-tests.nix @@ -1,4 +1,5 @@ { + lib ? pkgs.lib, pkgs, }: @@ -13,20 +14,8 @@ builtins.mapAttrs ( attr: pkg: - if - # TODO descend in `nixComponents_*` and override `nix-store`. Also - # need to introduce the flag needed to do that with. - # - # This must be done before Nix 2.26 and beyond becomes the default. - !(builtins.elem attr [ - "nixComponents_2_26" - "nix_2_26" - "latest" - ]) - # There may-be non-package things, like functions, in there too - && builtins.isAttrs pkg - then - pkg.override { withAWS = false; } + if lib.versionAtLeast pkg.version "2.26" then + pkg.overrideScope (finalScope: prevScope: { aws-sdk-cpp = null; }) else - pkg + pkg.override { withAWS = false; } ) pkgs.nixVersions From 09176212819e062d20d011aeb8799df89ba57f4d Mon Sep 17 00:00:00 2001 From: emaryn Date: Mon, 31 Mar 2025 07:13:16 +0800 Subject: [PATCH 070/107] vscode-extensions.visualjj.visualjj: add update script --- .../vscode/extensions/visualjj.visualjj/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index 039847f85ca9..3d2dfadd0000 100644 --- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -2,6 +2,7 @@ stdenvNoCC, lib, vscode-utils, + vscode-extensions-update-script, }: vscode-utils.buildVscodeMarketplaceExtension { @@ -31,13 +32,22 @@ vscode-utils.buildVscodeMarketplaceExtension { publisher = "visualjj"; version = "0.13.6"; } - // sources.${stdenvNoCC.system} or (throw "Unsupported system ${stdenvNoCC.system}"); + // sources.${stdenvNoCC.hostPlatform.system} + or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); + + passthru.updateScript = vscode-extensions-update-script { extraArgs = [ "--platforms" ]; }; meta = { description = "Jujutsu version control integration, for simpler Git workflow"; downloadPage = "https://www.visualjj.com"; homepage = "https://www.visualjj.com"; license = lib.licenses.unfree; + platforms = [ + "aarch64-linux" + "aarch64-darwin" + "x86_64-linux" + "x86_64-darwin" + ]; maintainers = [ lib.maintainers.drupol ]; }; } From 05a397d3ef53ad5b686d784b2ea9d19addceff78 Mon Sep 17 00:00:00 2001 From: emaryn Date: Sun, 30 Mar 2025 23:14:34 +0000 Subject: [PATCH 071/107] vscode-extensions.visualjj.visualjj: 0.13.6 -> 0.14.1 --- .../vscode/extensions/visualjj.visualjj/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index 3d2dfadd0000..37adf28d916f 100644 --- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-ub19F5vWUWg2eWUg/lst/+GrCsw6o6yeRQ9Lnb83Oow="; + hash = "sha256-eeLALUmJoIJfLKbX7MWQFIexfid7eOPTK0UE1sgd5jA="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-sNxpfCZbT4rCBn7fYBimFiNsMg72i8GmLfK7EP+8hHg="; + hash = "sha256-DftuIxJpP3zcfsoCam4FoqO2PSS/xPTmdefjhWAJqc0="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-snPaNPNTHFHZmaXckcjQuHTw/LvwaEj9irRLXnyrGHU="; + hash = "sha256-TiZTp19fcDYPvJnx7F/i96JD8gcE+t1irZstnuagchQ="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-wcNms02vhe3WSWn0HE7owf/0W25EZvkLvRn2oQJewd4="; + hash = "sha256-oXKAxgZ1IH+qiw9E/96J7rmvSHgLPwLZItLpFRjh7c0="; }; }; in { name = "visualjj"; publisher = "visualjj"; - version = "0.13.6"; + version = "0.14.1"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); From 8595ce3ed671887b6ef9e883afe8e1299a4d834c Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 24 Mar 2025 04:31:01 +0100 Subject: [PATCH 072/107] compiledb: 0.10.1 -> 0.10.7 --- pkgs/by-name/co/compiledb/package.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/co/compiledb/package.nix b/pkgs/by-name/co/compiledb/package.nix index 47fa3a007ecd..e2758b001ecb 100644 --- a/pkgs/by-name/co/compiledb/package.nix +++ b/pkgs/by-name/co/compiledb/package.nix @@ -7,22 +7,24 @@ python3Packages.buildPythonApplication rec { pname = "compiledb"; - version = "0.10.1"; + version = "0.10.7"; pyproject = true; - build-system = [ python3Packages.setuptools ]; - src = fetchFromGitHub { owner = "nickdiego"; repo = "compiledb"; - tag = "v${version}"; - hash = "sha256-pN2F0bFT5r8w+8kZOP/tU7Cx1SDN81fzkMfnj19jMWM="; + tag = version; + hash = "sha256-toqBf5q1EfZVhZN5DAtxkyFF7UlyNbqxWAIWFMwacxw="; }; + build-system = with python3Packages; [ + setuptools + setuptools-scm + ]; + dependencies = with python3Packages; [ click bashlex - shutilwhich ]; # fix the tests From da3e9fb55566e203877a5616292b5bb197a140f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Fri, 28 Mar 2025 20:58:40 +0100 Subject: [PATCH 073/107] lsd: re-enable tests --- pkgs/by-name/ls/lsd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ls/lsd/package.nix b/pkgs/by-name/ls/lsd/package.nix index 815aa15620cb..e3602446f902 100644 --- a/pkgs/by-name/ls/lsd/package.nix +++ b/pkgs/by-name/ls/lsd/package.nix @@ -6,6 +6,7 @@ pandoc, testers, lsd, + git, }: rustPlatform.buildRustPackage rec { @@ -37,8 +38,7 @@ rustPlatform.buildRustPackage rec { --zsh $releaseDir/build/lsd-*/out/_lsd ''; - # Found argument '--test-threads' which wasn't expected, or isn't valid in this context - doCheck = false; + nativeCheckInputs = [ git ]; passthru.tests.version = testers.testVersion { package = lsd; }; From 2e07c7e2f64047feccce7f3625f31e52092a0b0d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Mar 2025 00:46:29 +0000 Subject: [PATCH 074/107] vscode-extensions.anweber.vscode-httpyac: 6.16.6 -> 6.16.7 --- .../vscode/extensions/anweber.vscode-httpyac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/anweber.vscode-httpyac/default.nix b/pkgs/applications/editors/vscode/extensions/anweber.vscode-httpyac/default.nix index f508c192214a..7d897a5fd8d1 100644 --- a/pkgs/applications/editors/vscode/extensions/anweber.vscode-httpyac/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anweber.vscode-httpyac/default.nix @@ -5,14 +5,14 @@ }: let - version = "6.16.6"; + version = "6.16.7"; in vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-httpyac"; publisher = "anweber"; inherit version; - hash = "sha256-GR1DX6td/a75STpfIU0UtOxpNBWCkyzecEZdDMZTy1M="; + hash = "sha256-NAyVsEb3QBgq+cGWF03kjk2bQ8L5mulYYyIhIhjNVMQ="; }; buildInputs = [ httpyac ]; From e92837b03d26c3d661b97825d296c5ca86489c99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Mar 2025 01:00:19 +0000 Subject: [PATCH 075/107] feather: 2.7.0 -> 2.8.0 --- pkgs/by-name/fe/feather/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fe/feather/package.nix b/pkgs/by-name/fe/feather/package.nix index ce2be604fff4..06527893d2cf 100644 --- a/pkgs/by-name/fe/feather/package.nix +++ b/pkgs/by-name/fe/feather/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "feather"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "feather-wallet"; repo = "feather"; rev = finalAttrs.version; - hash = "sha256-CwydKX8cCtmrUSLUHNCDOteVmkjzj0zMHgwUyrWrWm8="; + hash = "sha256-c7qa6MmENCEjZz8b/xyCcCO2+iI5dI8hJynBW3haSWE="; fetchSubmodules = true; }; From 6154ce8bddd30621744ed8bbbd4ae32afb859cc8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Mar 2025 01:23:24 +0000 Subject: [PATCH 076/107] qpwgraph: 0.8.2 -> 0.8.3 --- pkgs/applications/audio/qpwgraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index 3ce6d57b3f14..44f40069bd34 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qpwgraph"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-BU57Iprz+kQXybKtR26Qi+3gsLv761hlg4HAnay6hIA="; + sha256 = "sha256-adgUpX2xfjf61//SUfhUU4NCP048q0WsTM4YkUny0UE="; }; nativeBuildInputs = [ From 21ec8478ed588617612ad2d5c935499df42655cb Mon Sep 17 00:00:00 2001 From: ghpzin Date: Sat, 29 Mar 2025 01:11:20 +0300 Subject: [PATCH 077/107] ns-3: 39 -> 44, fix build with gcc14 - update to latest release tag (ns-3.44), that contains commit: https://gitlab.com/nsnam/ns-3-dev/-/commit/5b130ba365831cf54674828e46cfa6b7b69c9f77 it fixes build with gcc14. Without it build fails with this and similar errors: ``` /build/source/src/core/model/val-array.h:83:16: error: template-id not allowed for constructor in C++20 [] 83 | ValArray() = default; | ^ ``` Diff: https://gitlab.com/nsnam/ns-3-dev/-/compare/ns-3.39...ns-3.44 Changelog: https://gitlab.com/nsnam/ns-3-dev/-/blob/ns-3.44/CHANGES.md --- .../development/libraries/science/networking/ns-3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/networking/ns-3/default.nix b/pkgs/development/libraries/science/networking/ns-3/default.nix index a69b6c27b6b0..3864959ec3d4 100644 --- a/pkgs/development/libraries/science/networking/ns-3/default.nix +++ b/pkgs/development/libraries/science/networking/ns-3/default.nix @@ -63,13 +63,13 @@ let in stdenv.mkDerivation rec { pname = "ns-3"; - version = "39"; + version = "44"; src = fetchFromGitLab { owner = "nsnam"; repo = "ns-3-dev"; rev = "ns-3.${version}"; - hash = "sha256-2d8xCCfxRpcCZgt7ne17F7cUo/wIxLyvjQs3izNUnmY="; + hash = "sha256-rw/WAMk4ZitULqkdyEh9vAFp1UrD1tw2JqgxOT5JQ5I="; }; nativeBuildInputs = [ From d27c6262e6d8d81ce10f9eb5e42912406a3897d5 Mon Sep 17 00:00:00 2001 From: ghpzin Date: Sun, 30 Mar 2025 19:56:28 +0300 Subject: [PATCH 078/107] rs: fix build with gcc14 - add `-DNEED_STRTONUM` flag to include declaration of `strtonum` from `rs.h`: ``` #ifdef NEED_STRTONUM /* .linked/strtonum.c */ extern long long strtonum(const char *, long long, long long, const char **); #endif ``` Fixes `implicit-function-declaration` error with gcc 14: ``` rs.c: In function 'getargs': rs.c:410:34: error: implicit declaration of function 'strtonum'; did you mean 'strtouq'? [] 410 | owidth = strtonum(optarg, 1, INT_MAX, &errstr); | ^~~~~~~~ | strtouq ``` --- pkgs/by-name/rs/rs/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/rs/rs/package.nix b/pkgs/by-name/rs/rs/package.nix index aaa8a9906121..3aa4f64a734d 100644 --- a/pkgs/by-name/rs/rs/package.nix +++ b/pkgs/by-name/rs/rs/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - ${stdenv.cc}/bin/cc utf8.c rs.c -o rs -lbsd + ${stdenv.cc}/bin/cc -DNEED_STRTONUM utf8.c rs.c -o rs -lbsd runHook postBuild ''; From efa1f9731768dc5488f415b183e323cb151980ce Mon Sep 17 00:00:00 2001 From: ghpzin Date: Sun, 30 Mar 2025 20:01:15 +0300 Subject: [PATCH 079/107] rs: modernize - replace `rec` with `finalAttrs` - remove `with lib;` from `meta` --- pkgs/by-name/rs/rs/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/rs/rs/package.nix b/pkgs/by-name/rs/rs/package.nix index 3aa4f64a734d..7cbe31a5292c 100644 --- a/pkgs/by-name/rs/rs/package.nix +++ b/pkgs/by-name/rs/rs/package.nix @@ -6,12 +6,12 @@ libbsd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rs"; version = "20200313"; src = fetchurl { - url = "https://www.mirbsd.org/MirOS/dist/mir/rs/rs-${version}.tar.gz"; + url = "https://www.mirbsd.org/MirOS/dist/mir/rs/rs-${finalAttrs.version}.tar.gz"; hash = "sha256-kZIV3J/oWiejC/Y9VkBs+1A/n8mCAyPEvTv+daajvD8="; }; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "http://www.mirbsd.org/htman/i386/man1/rs.htm"; description = "Reshape a data array from standard input"; mainProgram = "rs"; @@ -66,8 +66,8 @@ stdenv.mkDerivation rec { to control presentation of the output columns, including transposition of the rows and columns. ''; - license = licenses.bsd3; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; + license = lib.licenses.bsd3; + maintainers = [ ]; + platforms = lib.platforms.unix; }; -} +}) From 21af19fa5cbf04784303c65a688ce665c9a39e6f Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Sun, 30 Mar 2025 22:52:25 -0300 Subject: [PATCH 080/107] pplite: fix build with flint 3.2 --- pkgs/by-name/pp/pplite/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/pp/pplite/package.nix b/pkgs/by-name/pp/pplite/package.nix index cbdc9be37986..c128142921ca 100644 --- a/pkgs/by-name/pp/pplite/package.nix +++ b/pkgs/by-name/pp/pplite/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchurl, + fetchpatch, flint3, gmp, }: @@ -20,6 +21,15 @@ stdenv.mkDerivation { gmp ]; + patches = [ + # https://github.com/ezaffanella/PPLite/pull/1 + (fetchpatch { + name = "flint-3_2.patch"; + url = "https://github.com/ezaffanella/PPLite/commit/96fd1e50131f70bb78efdd60985525e970c9df06.patch"; + hash = "sha256-8FNyL8h/rBm2Hegib2l08vqEmFDU0PhMCV8Ui2G4xHQ="; + }) + ]; + meta = { homepage = "https://github.com/ezaffanella/PPLite"; description = "Convex polyhedra library for Abstract Interpretation"; From c5efe798bc669169236f248e095ee2f91cafa1ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 30 Mar 2025 19:38:22 -0700 Subject: [PATCH 081/107] python313Packages.pyisy: 3.1.14 -> 3.4.0 Diff: https://github.com/automicus/PyISY/compare/refs/tags/v3.1.14...v3.4.0 Changelog: https://github.com/automicus/PyISY/releases/tag/v3.1.15 https://github.com/automicus/PyISY/releases/tag/v3.2.0 https://github.com/automicus/PyISY/releases/tag/v3.3.0 https://github.com/automicus/PyISY/releases/tag/v3.4.0 --- pkgs/development/python-modules/pyisy/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pyisy/default.nix b/pkgs/development/python-modules/pyisy/default.nix index 30d2b6faa50f..210704420c69 100644 --- a/pkgs/development/python-modules/pyisy/default.nix +++ b/pkgs/development/python-modules/pyisy/default.nix @@ -5,23 +5,20 @@ colorlog, fetchFromGitHub, python-dateutil, - pythonOlder, requests, setuptools-scm, }: buildPythonPackage rec { pname = "pyisy"; - version = "3.1.14"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "3.4.0"; + pyproject = true; src = fetchFromGitHub { owner = "automicus"; repo = "PyISY"; tag = "v${version}"; - hash = "sha256-OvWdKr8RlXRnAUMHSPhJDacvKeRa8QGPmGPQWLG2ouk="; + hash = "sha256-rXSkDG7AK8+r4x3ttk7GJw1hH+xLLVx0gTGK0PvQNfE="; }; postPatch = '' @@ -29,9 +26,9 @@ buildPythonPackage rec { --replace 'version_format="{tag}"' 'version="${version}"' ''; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp colorlog python-dateutil @@ -46,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to talk to ISY994 from UDI"; homepage = "https://github.com/automicus/PyISY"; - changelog = "https://github.com/automicus/PyISY/releases/tag/v${version}"; + changelog = "https://github.com/automicus/PyISY/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; From b6420c7bca86997ad66218dcf4fb902efc7ac4f6 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Sun, 30 Mar 2025 22:46:13 -0400 Subject: [PATCH 082/107] gitignore: ignore worktrees --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index c40a3184e35c..4327aeb119e5 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,6 @@ update-git-commits.txt # JetBrains IDEA module declaration file /nixpkgs.iml + +# Usually used for manual backports +.worktree/ From ed2073bf6a7b5355f41d31e23e4c92be9a72aec0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 31 Mar 2025 13:15:00 +1000 Subject: [PATCH 083/107] python312Packages.mplhep: 0.3.58 -> 0.3.59 (#394370) --- pkgs/development/python-modules/mplhep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mplhep/default.nix b/pkgs/development/python-modules/mplhep/default.nix index adc92112fe91..c34460357977 100644 --- a/pkgs/development/python-modules/mplhep/default.nix +++ b/pkgs/development/python-modules/mplhep/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "mplhep"; - version = "0.3.58"; + version = "0.3.59"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "mplhep"; tag = "v${version}"; - hash = "sha256-d2dVOWR982QxAe6JVLyRIafA6x7CcNBO155cXMkCbYk="; + hash = "sha256-Xanj2AkFRq/zu2ntTHVt1QkikN0bYfRcBj6CBho15os="; }; build-system = [ From 58889e17f519ba789e1096eac8afcf73085c1265 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Mar 2025 03:22:43 +0000 Subject: [PATCH 084/107] mame: 0.275 -> 0.276 --- pkgs/applications/emulators/mame/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index 0c8be36fe52f..f8f24628cf4f 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -40,14 +40,14 @@ let in stdenv.mkDerivation rec { pname = "mame"; - version = "0.275"; + version = "0.276"; srcVersion = builtins.replaceStrings [ "." ] [ "" ] version; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${srcVersion}"; - hash = "sha256-VD0T+zoR8fPZqRwTVrk2k5ui3tLQumEg1Fd64SJdszU="; + hash = "sha256-HrEQmeCTwNXcEWcpXfLkBNnZdcZag4nB6ZN+8KKf5AE="; }; outputs = [ From c3edb5c06574df697088b8bbc7f3d6bc36ba10b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Mar 2025 03:33:02 +0000 Subject: [PATCH 085/107] python312Packages.scancode-toolkit: 32.3.1 -> 32.3.3 --- pkgs/development/python-modules/scancode-toolkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scancode-toolkit/default.nix b/pkgs/development/python-modules/scancode-toolkit/default.nix index e240c4d2077e..c40e980c68fc 100644 --- a/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -61,14 +61,14 @@ buildPythonPackage rec { pname = "scancode-toolkit"; - version = "32.3.1"; + version = "32.3.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Dy+umzXayQ89PiGz6JhHJ6Cuw/OwFsM0ix4vvLuyjb4="; + hash = "sha256-rOQR9Rhssibo6M8kovlEJVUhfLi6SbdP4RyNOWsTnCU="; }; dontConfigure = true; From 0dbddf816a6959442a5314f8654edac721761545 Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Sun, 30 Mar 2025 20:08:47 +0200 Subject: [PATCH 086/107] nixosTests.fail2ban: migrate to runTest --- nixos/tests/all-tests.nix | 2 +- nixos/tests/fail2ban.nix | 32 +++++++++++++++----------------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index bfcf94b20fbc..c3781765a682 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -386,7 +386,7 @@ in { etebase-server = handleTest ./etebase-server.nix {}; etesync-dav = handleTest ./etesync-dav.nix {}; evcc = runTest ./evcc.nix; - fail2ban = handleTest ./fail2ban.nix { }; + fail2ban = runTest ./fail2ban.nix; fakeroute = handleTest ./fakeroute.nix {}; fancontrol = handleTest ./fancontrol.nix {}; fanout = handleTest ./fanout.nix {}; diff --git a/nixos/tests/fail2ban.nix b/nixos/tests/fail2ban.nix index fc12b7aede56..93cea3f37c90 100644 --- a/nixos/tests/fail2ban.nix +++ b/nixos/tests/fail2ban.nix @@ -1,21 +1,19 @@ -import ./make-test-python.nix ( - { pkgs, ... }: - { - name = "fail2ban"; +{ pkgs, ... }: +{ + name = "fail2ban"; - nodes.machine = _: { - services.fail2ban = { - enable = true; - bantime-increment.enable = true; - }; - - services.openssh.enable = true; + nodes.machine = _: { + services.fail2ban = { + enable = true; + bantime-increment.enable = true; }; - testScript = '' - machine.wait_for_unit("multi-user.target") + services.openssh.enable = true; + }; - machine.wait_for_unit("fail2ban") - ''; - } -) + testScript = '' + machine.wait_for_unit("multi-user.target") + + machine.wait_for_unit("fail2ban") + ''; +} From cd6f6791e94d08b983fe6d127ec6942176737f6a Mon Sep 17 00:00:00 2001 From: Philipp Bartsch Date: Sun, 30 Mar 2025 20:25:50 +0200 Subject: [PATCH 087/107] nixosTests.fail2ban: extend test coverage --- nixos/tests/fail2ban.nix | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/nixos/tests/fail2ban.nix b/nixos/tests/fail2ban.nix index 93cea3f37c90..43acfa54cf7a 100644 --- a/nixos/tests/fail2ban.nix +++ b/nixos/tests/fail2ban.nix @@ -7,13 +7,40 @@ enable = true; bantime-increment.enable = true; }; - services.openssh.enable = true; + networking.nftables.enable = true; + }; + + nodes.client = _: { + environment.systemPackages = [ + pkgs.sshpass + pkgs.libressl.nc + ]; + }; testScript = '' - machine.wait_for_unit("multi-user.target") + start_all() + # Wait for everything to be ready. + machine.wait_for_unit("multi-user.target") machine.wait_for_unit("fail2ban") + machine.wait_for_unit("sshd") + client.wait_for_unit("multi-user.target") + + client_addr = "2001:db8:1::1" + machine_addr = "2001:db8:1::2" + + # Verify there is not ban and the port is reachable from the client. + machine.succeed(f"test 0 -eq $(fail2ban-client get sshd banned {client_addr})") + client.succeed(f"nc -w3 -z {machine_addr} 22") + + # Cause authentication failure log entries. + for _ in range(2): + client.fail(f"sshpass -p 'wrongpassword' ssh -o StrictHostKeyChecking=no {machine_addr}") + + # Verify there is a ban and the port is unreachable from the client. + machine.wait_until_succeeds(f"test 1 -eq $(fail2ban-client get sshd banned {client_addr})") + client.fail(f"nc -w3 -z {machine_addr} 22") ''; } From eb74e7f1a6eb4ac8dfc80cdee52448dbed8d3a94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Mar 2025 04:04:02 +0000 Subject: [PATCH 088/107] obs-studio: 31.0.2 -> 31.0.3 --- pkgs/applications/video/obs-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index be1933e5471e..3087efa89c00 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -68,13 +68,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "obs-studio"; - version = "31.0.2"; + version = "31.0.3"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = finalAttrs.version; - hash = "sha256-I8VExGFr0thEaT8vHvdNwck7AYSpdpfLVPjij1Utt0E="; + hash = "sha256-i1wkGlafPvfMTsQr5Ww5iwmUu+23cr0YmN10llJfohA="; fetchSubmodules = true; }; From 9547dfd9310f28537804fa53e33555e29ed4f408 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 31 Mar 2025 13:19:55 +0800 Subject: [PATCH 089/107] golangci-lint: 2.0.0 -> 2.0.2 --- pkgs/by-name/go/golangci-lint/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix index bb509f30c042..4d1517f03fc9 100644 --- a/pkgs/by-name/go/golangci-lint/package.nix +++ b/pkgs/by-name/go/golangci-lint/package.nix @@ -7,13 +7,13 @@ buildGo124Module rec { pname = "golangci-lint"; - version = "2.0.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-1TDYMjFEyI9ULnLn+1RYxRWrGkJZcEDDGvLb4qiVLNc="; + hash = "sha256-+IndC9znKgVGiFWW0aCNjhxPwX1kDFnfG2+SKEQ15Rc="; }; vendorHash = "sha256-B6mCvJtIfRbAv6fZ8Ge82nT9oEcL3WR4D+AAVs9R3zM="; From 9980ac66beb46cd51a2d7e12ee90b843e7757c8d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Mar 2025 05:21:47 +0000 Subject: [PATCH 090/107] lazysql: 0.3.6 -> 0.3.7 --- pkgs/by-name/la/lazysql/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix index 9b1b5c2647b9..226c81239957 100644 --- a/pkgs/by-name/la/lazysql/package.nix +++ b/pkgs/by-name/la/lazysql/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "lazysql"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "jorgerojas26"; repo = "lazysql"; rev = "v${version}"; - hash = "sha256-tQZ8thL3rmTtxDG0Z/DgxH1PjDL4Kxx9LXDLqVTZ7Lc="; + hash = "sha256-fpzcCCLkUJGuTfQiADwLL2238LP0TJJMYAXUwCfPkFM="; }; vendorHash = "sha256-LLOUTml/mz7edCUy82k+S5PfpFovgUTQr0BoQQXiVGs="; From 86c7364c4cd03c632a30298dace64c898a081d54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Mar 2025 05:28:39 +0000 Subject: [PATCH 091/107] rke: 1.8.0 -> 1.8.1 --- pkgs/by-name/rk/rke/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rk/rke/package.nix b/pkgs/by-name/rk/rke/package.nix index bb971a848e3a..0994d8527043 100644 --- a/pkgs/by-name/rk/rke/package.nix +++ b/pkgs/by-name/rk/rke/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "rke"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-5KL9XAd0CnJ7yTfU1KpYqHBu9DxTTqo2fMPAr9IqqZY="; + hash = "sha256-mTSeUFmkXI9yZ1yeBXzudf2BmLtdmoiTlB/wtn++NAo="; }; vendorHash = "sha256-5+BjXPh52RNoaU/ABpvgbAO+mKcW4Hg2SRxRhV9etIo="; From b8300894a946993506d56a9b2ecbfc2af2d5f2ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Mar 2025 05:32:35 +0000 Subject: [PATCH 092/107] ecs-agent: 1.91.1 -> 1.91.2 --- pkgs/by-name/ec/ecs-agent/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ec/ecs-agent/package.nix b/pkgs/by-name/ec/ecs-agent/package.nix index c3d809614cd6..7d7932f9c5d3 100644 --- a/pkgs/by-name/ec/ecs-agent/package.nix +++ b/pkgs/by-name/ec/ecs-agent/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.91.1"; + version = "1.91.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-BIfyuZ7bf1P/8JfavIJNi06k8zEcCL1jwxAEnknpqq4="; + hash = "sha256-7f1qJ9dgouhj+DGikdIzUREPraAA/1y/5lYA8fbIoJo="; }; vendorHash = null; From 49ca8bcb4d7637abc0318918a7f461fb7415c7b5 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Sat, 29 Mar 2025 16:35:48 -0700 Subject: [PATCH 093/107] dsview: unbreak on GCC 14, modernize --- .../science/electronics/dsview/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix index 0141bd2ebadc..44a1e07ced10 100644 --- a/pkgs/applications/science/electronics/dsview/default.nix +++ b/pkgs/applications/science/electronics/dsview/default.nix @@ -16,7 +16,7 @@ desktopToDarwinBundle, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dsview"; version = "1.3.2"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "DreamSourceLab"; repo = "DSView"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-d/TfCuJzAM0WObOiBhgfsTirlvdROrlCm+oL1cqUrIs="; }; @@ -33,6 +33,9 @@ stdenv.mkDerivation rec { ./install.patch ]; + # /build/source/libsigrok4DSL/strutil.c:343:19: error: implicit declaration of function 'strcasecmp'; did you mean 'g_strcasecmp'? [] + env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + nativeBuildInputs = [ cmake pkg-config @@ -49,15 +52,15 @@ stdenv.mkDerivation rec { python3 ] ++ lib.optional stdenv.hostPlatform.isLinux qtwayland; - meta = with lib; { + meta = { description = "GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc"; mainProgram = "DSView"; homepage = "https://www.dreamsourcelab.com/"; - license = licenses.gpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ bachp carlossless ]; }; -} +}) From a83347b14b0bc885d945cb979f5bae6222ed5aa0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 31 Mar 2025 08:42:19 +0200 Subject: [PATCH 094/107] =?UTF-8?q?omake:=200.10.6=20=E2=86=92=200.10.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/om/omake/package.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/om/omake/package.nix b/pkgs/by-name/om/omake/package.nix index 2cb994682e72..b570810c45a7 100644 --- a/pkgs/by-name/om/omake/package.nix +++ b/pkgs/by-name/om/omake/package.nix @@ -1,18 +1,19 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, ocaml, }: -stdenv.mkDerivation rec { - +stdenv.mkDerivation (finalAttrs: { pname = "omake"; - version = "0.10.6"; + version = "0.10.7"; - src = fetchurl { - url = "http://download.camlcity.org/download/${pname}-${version}.tar.gz"; - hash = "sha256-AuSZEnybyk8HaDZ7mbwDqjFXMXVQ7TDRuRU/aRY8/yE="; + src = fetchFromGitHub { + owner = "ocaml-omake"; + repo = "omake"; + tag = "omake-${finalAttrs.version}"; + hash = "sha256-5ZOdY3uGcI0KGpnr7epUwe2ueKCoLeaHGzaiTiXLNoc="; }; strictDeps = true; @@ -28,4 +29,4 @@ stdenv.mkDerivation rec { ]; inherit (ocaml.meta) platforms; }; -} +}) From 6f6d4aa9e94380232823d77ec2380d57c035433e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Mar 2025 06:51:01 +0000 Subject: [PATCH 095/107] b3sum: 1.7.0 -> 1.8.0 --- pkgs/by-name/b3/b3sum/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/b3/b3sum/package.nix b/pkgs/by-name/b3/b3sum/package.nix index f56158ddaf86..31088ea5fd1a 100644 --- a/pkgs/by-name/b3/b3sum/package.nix +++ b/pkgs/by-name/b3/b3sum/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "b3sum"; - version = "1.7.0"; + version = "1.8.0"; src = fetchCrate { inherit version pname; - hash = "sha256-bDydKLPJgeUngkWO8L5BkJP9rGy3mx0QJhWAN2CCYhE="; + hash = "sha256-FWblGKr/ZQsLZkPOax20FYEyoLiPREf7UjfOtFCljZU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-yB0noD5eabr+HANPRhIhBEG4PCwtJPULNIy+Wx/tC3U="; + cargoHash = "sha256-vSxAG0CKtTHZ/3fSDtZqmqvfY+swDBBPZ8YZP1Vlj0w="; meta = { description = "BLAKE3 cryptographic hash function"; From a9df43c4293b355e07998bf0f24cc2b325a54883 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Sun, 23 Mar 2025 18:15:05 +0100 Subject: [PATCH 096/107] mesa: reenable XA for now --- pkgs/development/libraries/mesa/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 14f98cb9d407..024011333668 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -200,7 +200,11 @@ in stdenv.mkDerivation { (lib.mesonBool "gallium-nine" false) # Direct3D9 in Wine, largely supplanted by DXVK (lib.mesonBool "osmesa" false) # deprecated upstream - (lib.mesonEnable "gallium-xa" false) # old and mostly dead + + # Only used by xf86-video-vmware, which has more features than VMWare's KMS driver, + # so we're keeping it for now. Should be removed when that's no longer the case. + # See: https://github.com/NixOS/nixpkgs/pull/392492 + (lib.mesonEnable "gallium-xa" true) (lib.mesonBool "teflon" true) # TensorFlow frontend From 6d11b756a43adb43bc4be31a42e6ab45d7bd7697 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Sun, 23 Mar 2025 18:18:55 +0100 Subject: [PATCH 097/107] xorg.xf86videovmware: restore Mesa/XA dependency --- pkgs/servers/x11/xorg/overrides.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index b52627533773..bfbf31f9193e 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -604,6 +604,7 @@ self: super: }); xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: { + buildInputs = attrs.buildInputs ++ [ mesa ]; env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=address" ]; # gcc12 meta = attrs.meta // { platforms = ["i686-linux" "x86_64-linux"]; From 1237682d298e430ad1730561f12e4876cb2b6781 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 31 Mar 2025 09:23:25 +0200 Subject: [PATCH 098/107] python313Packages.tencentcloud-sdk-python: 3.0.1350 -> 3.0.1351 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1350...3.0.1351 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1351/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 7a709a847025..43b4f8db9244 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.1350"; + version = "3.0.1351"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-ITdA2Z7MWZskPlSOqS9T49v4f/JQXB8Uuq+p9AugIcA="; + hash = "sha256-FJ+o3lJTvpt3YTWHdIuD2jx0GV+rIjK7To+yt0ReuZQ="; }; build-system = [ setuptools ]; From 4117dceede40303acfc8171e88c39b63dd5a073c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 31 Mar 2025 09:53:05 +0200 Subject: [PATCH 099/107] Revert "tiledb: 2.18.2 -> 2.27.2" --- .../ti/tiledb/FindMagic_EP.cmake.patch | 14 +++ pkgs/by-name/ti/tiledb/package.nix | 101 +++++++++--------- 2 files changed, 67 insertions(+), 48 deletions(-) create mode 100644 pkgs/by-name/ti/tiledb/FindMagic_EP.cmake.patch diff --git a/pkgs/by-name/ti/tiledb/FindMagic_EP.cmake.patch b/pkgs/by-name/ti/tiledb/FindMagic_EP.cmake.patch new file mode 100644 index 000000000000..7a5a01c54588 --- /dev/null +++ b/pkgs/by-name/ti/tiledb/FindMagic_EP.cmake.patch @@ -0,0 +1,14 @@ +diff --git a/FindMagic_EP.cmake b/FindMagic_EP.cmake +--- a/cmake/Modules/FindMagic_EP.cmake ++++ b/cmake/Modules/FindMagic_EP.cmake +@@ -126,9 +126,7 @@ if(NOT TILEDB_LIBMAGIC_EP_BUILT) + # that was modified by tiledb to also build with cmake for nix + ExternalProject_Add(ep_magic + PREFIX "externals" +- GIT_REPOSITORY "https://github.com/TileDB-Inc/file-windows.git" +- GIT_TAG "5.38.2.tiledb" +- GIT_SUBMODULES_RECURSE TRUE ++ DOWNLOAD_COMMAND true + UPDATE_COMMAND "" + CMAKE_ARGS + -DCMAKE_INSTALL_PREFIX=${TILEDB_EP_INSTALL_PREFIX} diff --git a/pkgs/by-name/ti/tiledb/package.nix b/pkgs/by-name/ti/tiledb/package.nix index 3d58b1bc6780..ca15cf16221e 100644 --- a/pkgs/by-name/ti/tiledb/package.nix +++ b/pkgs/by-name/ti/tiledb/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + cmake, zlib, lz4, @@ -15,56 +16,70 @@ clang-tools, catch2_3, python3, + gtest, doxygen, fixDarwinDylibNames, - gtest, - rapidcheck, - libpng, - file, - runCommand, - catch2, useAVX2 ? stdenv.hostPlatform.avx2Support, }: let - rapidcheck' = runCommand "rapidcheck" { } '' - cp -r ${rapidcheck.out} $out - chmod -R +w $out - cp -r ${rapidcheck.dev}/* $out - ''; + # pre-fetch ExternalProject from cmake/Modules/FindMagic_EP.cmake + ep-file-windows = fetchFromGitHub { + owner = "TileDB-Inc"; + repo = "file-windows"; + rev = "5.38.2.tiledb"; + hash = "sha256-TFn30VCuWZr252VN1T5NNCZe2VEN3xQSomS7XxxKGF8="; + fetchSubmodules = true; + }; + in stdenv.mkDerivation rec { pname = "tiledb"; - version = "2.27.2"; + version = "2.18.2"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB"; - tag = version; - hash = "sha256-zk4jkXJMh6wpuEKaCvuKUDod+F8B/6W5Lw8gwelcPEM="; + rev = version; + hash = "sha256-uLiXhigYz3v7NgY38twot3sBHxZS5QCrOiPfME4wWzE="; }; - # libcxx (as of llvm-19) does not yet support `stop_token` and `jthread` - # without the -fexperimental-library flag. Tiledb adds its own - # implementations in the std namespace which conflict with libcxx. This - # test can be re-enabled once libcxx supports stop_token and jthread. - postPatch = lib.optionalString (stdenv.cc.libcxx != null) '' - truncate -s0 tiledb/stdx/test/CMakeLists.txt - ''; + patches = [ + ./FindMagic_EP.cmake.patch + ]; - env.TILEDB_DISABLE_AUTO_VCPKG = "1"; + postPatch = + '' + # copy pre-fetched external project to directory where it is expected to be + mkdir -p build/externals/src + cp -a ${ep-file-windows} build/externals/src/ep_magic + chmod -R u+w build/externals/src/ep_magic + + # add openssl on path + sed -i '49i list(APPEND OPENSSL_PATHS "${openssl.dev}" "${openssl.out}")' \ + cmake/Modules/FindOpenSSL_EP.cmake + '' + # libcxx (as of llvm-19) does not yet support `stop_token` and `jthread` + # without the -fexperimental-library flag. Tiledb adds its own + # implementations in the std namespace which conflict with libcxx. This + # test can be re-enabled once libcxx supports stop_token and jthread. + + lib.optionalString (stdenv.cc.libcxx != null) '' + truncate -s0 tiledb/stdx/test/CMakeLists.txt + ''; + + # upstream will hopefully fix this in some newer release + env.CXXFLAGS = "-include random"; # (bundled) blosc headers have a warning on some archs that it will be using # unaccelerated routines. cmakeFlags = [ + "-DTILEDB_VCPKG=OFF" "-DTILEDB_WEBP=OFF" "-DTILEDB_WERROR=OFF" - # https://github.com/NixOS/nixpkgs/issues/144170 - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_LIBDIR=lib" ] ++ lib.optional (!useAVX2) "-DCOMPILER_SUPPORTS_AVX2=FALSE"; nativeBuildInputs = [ + ep-file-windows catch2_3 clang-tools cmake @@ -72,6 +87,10 @@ stdenv.mkDerivation rec { doxygen ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + nativeCheckInputs = [ + gtest + ]; + buildInputs = [ zlib lz4 @@ -82,34 +101,20 @@ stdenv.mkDerivation rec { openssl boost libpqxx - libpng - file - rapidcheck' - catch2 - ]; - - # fatal error: catch.hpp: No such file or directory - doCheck = false; - - nativeCheckInputs = [ - gtest - catch2 ]; # test commands taken from # https://github.com/TileDB-Inc/TileDB/blob/dev/.github/workflows/unit-test-runs.yml checkPhase = '' runHook preCheck - - pushd .. - cmake --build build --target tests - ctest --test-dir build -R '(^unit_|test_assert)' --no-tests=error - ctest --test-dir build -R 'test_ci_asserts' - popd - + make -C tiledb tests -j$NIX_BUILD_CORES + make -C tiledb test ARGS="-R '^unit_'" -R "test_assert" + make -C tiledb test ARGS="-R 'test_ci_asserts'" runHook postCheck ''; + doCheck = true; + installTargets = [ "install-tiledb" "doc" @@ -119,11 +124,11 @@ stdenv.mkDerivation rec { install_name_tool -add_rpath ${tbb}/lib $out/lib/libtiledb.dylib ''; - meta = { + meta = with lib; { description = "TileDB allows you to manage the massive dense and sparse multi-dimensional array data"; homepage = "https://github.com/TileDB-Inc/TileDB"; - license = lib.licenses.mit; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ rakesh4g ]; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ rakesh4g ]; }; } From d5d9044f0aec43813a892df93b4f6621c182596f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Mar 2025 23:29:17 +0000 Subject: [PATCH 100/107] =?UTF-8?q?meld:=203.22.3=20=E2=86=92=203.23.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/meld/-/compare/3.22.3...3.23.0 --- pkgs/by-name/me/meld/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/me/meld/package.nix b/pkgs/by-name/me/meld/package.nix index 47889a88c2dc..35ef072d6b25 100644 --- a/pkgs/by-name/me/meld/package.nix +++ b/pkgs/by-name/me/meld/package.nix @@ -22,13 +22,13 @@ python3.pkgs.buildPythonApplication rec { pname = "meld"; - version = "3.22.3"; + version = "3.23.0"; format = "other"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-N/fynrH/D+xNiwiNVIPFVt4QifbQGP5tSBmTyvJJnYQ="; + url = "mirror://gnome/sources/meld/${lib.versions.majorMinor version}/meld-${version}.tar.xz"; + hash = "sha256-mDwqQkDgJaIQnHc4GYcQ6dawY8kQsEgzLRRpDPU4wqY="; }; nativeBuildInputs = [ @@ -62,7 +62,7 @@ python3.pkgs.buildPythonApplication rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "meld"; versionPolicy = "none"; # should be odd-unstable but we are tracking unstable versions for now }; }; From 66917f1c8da3d34dc10e8c33e07da5cc47ae331d Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Mon, 31 Mar 2025 04:26:31 -0400 Subject: [PATCH 101/107] yabridge: revert workaround for wine 9.5 (#394378) This reverts commit aa263fc8a00458a08837f7c8753f9c485becaf85. --- pkgs/tools/audio/yabridge/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index ef97b99163f3..78bf12e51018 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -152,11 +152,10 @@ multiStdenv.mkDerivation (finalAttrs: { # Hard code wine path in wrapper scripts generated by winegcc postFixup = '' - substituteInPlace "$out/bin/yabridge-host-32.exe" \ - --replace 'WINELOADER="wine"' 'WINELOADER="${wine}/bin/wine"' - - substituteInPlace "$out/bin/yabridge-host.exe" \ - --replace 'WINELOADER="wine"' 'WINELOADER="${wine}/bin/wine64"' + for exe in "$out"/bin/*.exe; do + substituteInPlace "$exe" \ + --replace-fail 'WINELOADER="wine"' 'WINELOADER="${wine}/bin/wine"' + done ''; passthru.updateScript = nix-update-script { }; From 71a4b4bf223d8e448c5208b11043b37cb8c400fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Mar 2025 20:34:07 +0000 Subject: [PATCH 102/107] cloud-hypervisor: 44.0 -> 45.0 --- pkgs/by-name/cl/cloud-hypervisor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/cloud-hypervisor/package.nix b/pkgs/by-name/cl/cloud-hypervisor/package.nix index e57267e81c89..bfaf3e536471 100644 --- a/pkgs/by-name/cl/cloud-hypervisor/package.nix +++ b/pkgs/by-name/cl/cloud-hypervisor/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "44.0"; + version = "45.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = "cloud-hypervisor"; rev = "v${version}"; - hash = "sha256-2nA8bhezmGa6Gu420nxDrgW0SonTQv1WoGYmBwm7/bI="; + hash = "sha256-PmgHO3gRE/LfLiRC+sAQXKUeclweVUNJV2ihpkvx0Wg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-e2VbzBPfoy5+YrqZ5mkbxMLpQIOG0x5tIhNG6Tv+u0M="; + cargoHash = "sha256-h9ydLEp7GpW5jMkt5jObR09lPWGs+rmvdoEZntIZwxY="; separateDebugInfo = true; From cd85a8a82762745e86e8d1f7a34bd3989ee2748e Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Mon, 24 Mar 2025 00:55:17 +0530 Subject: [PATCH 103/107] nixos/modules: cosmic-greeter: init --- nixos/modules/module-list.nix | 1 + .../display-managers/cosmic-greeter.nix | 70 +++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 nixos/modules/services/display-managers/cosmic-greeter.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 72859f101435..5c8367bc422b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -579,6 +579,7 @@ ./services/development/vsmartcard-vpcd.nix ./services/development/zammad.nix ./services/display-managers/default.nix + ./services/display-managers/cosmic-greeter.nix ./services/display-managers/greetd.nix ./services/display-managers/sddm.nix ./services/display-managers/ly.nix diff --git a/nixos/modules/services/display-managers/cosmic-greeter.nix b/nixos/modules/services/display-managers/cosmic-greeter.nix new file mode 100644 index 000000000000..64cd8667b365 --- /dev/null +++ b/nixos/modules/services/display-managers/cosmic-greeter.nix @@ -0,0 +1,70 @@ +# SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: Lily Foster +# Portions of this code are adapted from nixos-cosmic +# https://github.com/lilyinstarlight/nixos-cosmic + +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.displayManager.cosmic-greeter; +in + +{ + meta.maintainers = with lib.maintainers; [ + thefossguy + HeitorAugustoLN + nyabinary + ahoneybun + ]; + + options.services.displayManager.cosmic-greeter = { + enable = lib.mkEnableOption "COSMIC greeter"; + package = lib.mkPackageOption pkgs "cosmic-greeter" { }; + }; + + config = lib.mkIf cfg.enable { + services.greetd = { + enable = true; + settings = { + default_session = { + user = "cosmic-greeter"; + command = ''${lib.getExe' pkgs.coreutils "env"} XCURSOR_THEME="''${XCURSOR_THEME:-Pop}" systemd-cat -t cosmic-greeter ${lib.getExe pkgs.cosmic-comp} ${lib.getExe cfg.package}''; + }; + }; + }; + + # Daemon for querying background state and such + systemd.services.cosmic-greeter-daemon = { + wantedBy = [ "multi-user.target" ]; + before = [ "greetd.service" ]; + serviceConfig = { + Type = "dbus"; + BusName = "com.system76.CosmicGreeter"; + ExecStart = lib.getExe' cfg.package "cosmic-greeter-daemon"; + Restart = "on-failure"; + }; + }; + + # The greeter user is hardcoded in `cosmic-greeter` + users.groups.cosmic-greeter = { }; + users.users.cosmic-greeter = { + description = "COSMIC login greeter user"; + isSystemUser = true; + home = "/var/lib/cosmic-greeter"; + createHome = true; + group = "cosmic-greeter"; + }; + # Setup PAM authentication for the `cosmic-greeter` user + security.pam.services.cosmic-greeter = { }; + + hardware.graphics.enable = true; + services.accounts-daemon.enable = true; + services.dbus.packages = [ cfg.package ]; + services.libinput.enable = true; + }; +} From cd795fd3f0a910b60cf9823284f3e99ba367301e Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Mon, 24 Mar 2025 01:39:32 +0530 Subject: [PATCH 104/107] nixos/modules: cosmic: init --- .../services/desktop-managers/cosmic.nix | 142 ++++++++++++++++++ .../services/x11/desktop-managers/default.nix | 1 + 2 files changed, 143 insertions(+) create mode 100644 nixos/modules/services/desktop-managers/cosmic.nix diff --git a/nixos/modules/services/desktop-managers/cosmic.nix b/nixos/modules/services/desktop-managers/cosmic.nix new file mode 100644 index 000000000000..a6aa7cc3e826 --- /dev/null +++ b/nixos/modules/services/desktop-managers/cosmic.nix @@ -0,0 +1,142 @@ +# SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: Lily Foster +# Portions of this code are adapted from nixos-cosmic +# https://github.com/lilyinstarlight/nixos-cosmic + +{ + config, + lib, + pkgs, + utils, + ... +}: + +let + cfg = config.services.desktopManager.cosmic; +in +{ + meta.maintainers = with lib.maintainers; [ + thefossguy + HeitorAugustoLN + nyabinary + ahoneybun + ]; + + options = { + services.desktopManager.cosmic = { + enable = lib.mkEnableOption "Enable the COSMIC desktop environment"; + + xwayland.enable = lib.mkEnableOption "Xwayland support for the COSMIC compositor" // { + default = true; + }; + }; + }; + + config = lib.mkIf cfg.enable { + # Environment packages + environment.pathsToLink = [ + "/share/backgrounds" + "/share/cosmic" + ]; + environment.systemPackages = + with pkgs; + [ + adwaita-icon-theme + alsa-utils + cosmic-applets + cosmic-applibrary + cosmic-bg + (cosmic-comp.override { useXWayland = false; }) + cosmic-edit + cosmic-files + config.services.displayManager.cosmic-greeter.package + cosmic-icons + cosmic-idle + cosmic-launcher + cosmic-notifications + cosmic-osd + cosmic-panel + cosmic-player + cosmic-randr + cosmic-screenshot + cosmic-session + cosmic-settings + cosmic-settings-daemon + cosmic-term + cosmic-wallpapers + cosmic-workspaces-epoch + hicolor-icon-theme + playerctl + pop-icon-theme + pop-launcher + xdg-user-dirs + ] + ++ lib.optionals cfg.xwayland.enable [ + xwayland + ] + ++ lib.optionals config.services.flatpak.enable [ + cosmic-store + ]; + + # Distro-wide defaults for graphical sessions + services.graphical-desktop.enable = true; + + xdg = { + icons.fallbackCursorThemes = lib.mkDefault [ "Cosmic" ]; + + portal = { + enable = true; + extraPortals = with pkgs; [ + xdg-desktop-portal-cosmic + xdg-desktop-portal-gtk + ]; + configPackages = lib.mkDefault [ pkgs.xdg-desktop-portal-cosmic ]; + }; + }; + + systemd = { + packages = [ pkgs.cosmic-session ]; + user.targets = { + cosmic-session = { + wants = [ "xdg-desktop-autostart.target" ]; + before = [ "xdg-desktop-autostart.target" ]; + }; + tray = { + description = "Cosmic Tray Target"; + requires = [ "graphical-session-pre.target" ]; + }; + }; + }; + + fonts.packages = with pkgs; [ + fira + noto-fonts + open-sans + ]; + + # Required options for the COSMIC DE + environment.sessionVariables.X11_BASE_RULES_XML = "${config.services.xserver.xkb.dir}/rules/base.xml"; + environment.sessionVariables.X11_EXTRA_RULES_XML = "${config.services.xserver.xkb.dir}/rules/base.extras.xml"; + programs.dconf.enable = true; + programs.dconf.packages = [ pkgs.cosmic-session ]; + security.polkit.enable = true; + security.rtkit.enable = true; + services.accounts-daemon.enable = true; + services.displayManager.sessionPackages = [ pkgs.cosmic-session ]; + services.libinput.enable = true; + services.upower.enable = true; + # Setup PAM authentication for the `cosmic-greeter` user + security.pam.services.cosmic-greeter = { }; + + # Good to have defaults + hardware.bluetooth.enable = lib.mkDefault true; + networking.networkmanager.enable = lib.mkDefault true; + services.acpid.enable = lib.mkDefault true; + services.avahi.enable = lib.mkDefault true; + services.gnome.gnome-keyring.enable = lib.mkDefault true; + services.gvfs.enable = lib.mkDefault true; + services.power-profiles-daemon.enable = lib.mkDefault ( + !config.hardware.system76.power-daemon.enable + ); + }; +} diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 42e66e86e1a3..4c0de95040c9 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -21,6 +21,7 @@ in ./lxqt.nix ./enlightenment.nix ./gnome.nix ./retroarch.nix ./kodi.nix ./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix ./cinnamon.nix ./budgie.nix ./deepin.nix ../../desktop-managers/lomiri.nix + ../../desktop-managers/cosmic.nix ]; options = { From 2a7180b3db2d9b98683941e8f1d14c444ce93a7a Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Sun, 30 Mar 2025 15:45:29 +0530 Subject: [PATCH 105/107] nixos/release-notes: add release notes for COSMIC modules --- nixos/doc/manual/release-notes/rl-2505.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 94f1fe272ee5..fa8e186f7b63 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -10,6 +10,8 @@ Users on old macOS versions should consider upgrading to a supported version (potentially using [OpenCore Legacy Patcher](https://dortania.github.io/OpenCore-Legacy-Patcher/) for old hardware) or installing NixOS. If neither of those options are viable and you require new versions of software, [MacPorts](https://www.macports.org/) supports versions back to Mac OS X Snow Leopard 10.6. +- Initial support for the [COSMIC DE](https://system76.com/cosmic), a Rust-based desktop environment by System76, makers of Pop!_OS. Toggle the greeter (login manager) using `services.displayManager.cosmic-greeter.enable` and the DE itself with `services.desktopManager.cosmic.enable`. Mostly stable but still experimental. Please report any issues to the [COSMIC DE tracker in Nixpkgs](https://github.com/NixOS/nixpkgs/issues/259641) instead of upstream. + - The default kernel package has been updated from 6.6 to 6.12. All supported kernels remain available. - GCC has been updated from GCC 13 to GCC 14. From 2107f032ab4befe851cd1035d88db9dd3474689d Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Fri, 28 Mar 2025 21:11:21 +0100 Subject: [PATCH 106/107] nixos/startx: remove graphical-session assertions this assertion broke gnome sessions in very hard to debug way: - gdm starts, but on successful login just returns to login screen - journalctl isn't exactly helpful in this condition: - a typical gnome login will involve many warnings and errors, that aren't actually preventing login, but will lead affected users on a merry chase for many hours - the actual indicators in the log arent't even an errors, only info and warning - graphical-session.target: Starting requested but asserts failed. - Assertion failed for Current graphical user session. startx is a power tool for power users, needing a certain level of expertise for the user to even want it, let alone use correctly. However, the expectation is, that the necessary expertise will be contained within the domain of startx and that it not break tools for regular users. This partially reverts commit e1c30820858c767d1c77d0e24472b9424b2103ed. --- nixos/modules/services/x11/display-managers/startx.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/startx.nix b/nixos/modules/services/x11/display-managers/startx.nix index 2cc574e1687b..792a0e9b7d7c 100644 --- a/nixos/modules/services/x11/display-managers/startx.nix +++ b/nixos/modules/services/x11/display-managers/startx.nix @@ -102,14 +102,6 @@ in environment.systemPackages = with pkgs; [ xorg.xinit ]; - # Make graphical-session fail if the user environment has not been imported - systemd.user.targets.graphical-session = { - unitConfig.AssertEnvironment = [ - "DISPLAY" - "XDG_SESSION_ID" - ]; - }; - }; } From 76ba3d47e52c003a00934c5b56d9b2b0ad0f0d52 Mon Sep 17 00:00:00 2001 From: "Remy D. Farley" Date: Sat, 29 Mar 2025 15:31:52 +0000 Subject: [PATCH 107/107] yggstack: 1.0.1 -> 1.0.4 --- pkgs/by-name/yg/yggstack/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/yg/yggstack/package.nix b/pkgs/by-name/yg/yggstack/package.nix index 1dd155c7bd42..8a1ed1ccd5fd 100644 --- a/pkgs/by-name/yg/yggstack/package.nix +++ b/pkgs/by-name/yg/yggstack/package.nix @@ -2,20 +2,21 @@ lib, buildGoModule, fetchFromGitHub, + nix-update-script, }: buildGoModule rec { pname = "yggstack"; - version = "1.0.1"; + version = "1.0.4"; src = fetchFromGitHub { owner = "yggdrasil-network"; repo = "yggstack"; rev = "${version}"; - hash = "sha256-RQ7AvVv+VLfgzlb7orZbSB7TNz/hj2fo832ed4WUN80="; + hash = "sha256-S3yk2v2RPGFeGDJ8Lmjr7VM2kIswIREfPpDLXM/P1YU="; }; - vendorHash = "sha256-Hjb3KSh+2qYYKdgv4+dsSp0kAbzz8gu9qnQdA7wB5fA="; + vendorHash = "sha256-7EIUsMhAJ+uPD5LG7Yucpo82aJYYRt9vrmAbsQzNmEw="; ldflags = [ "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildVersion=${version}" @@ -26,6 +27,8 @@ buildGoModule rec { doCheck = false; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Yggdrasil as SOCKS proxy / port forwarder"; homepage = "https://yggdrasil-network.github.io/";