From 7fb2f407c01b017737eafc26b065d7f56434a992 Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Mon, 9 Dec 2024 11:08:35 +0100 Subject: [PATCH 01/53] nixos/getty: only include if config.console.enable This makes it so that the getty units are only included if `config.console.enable` is set to `true`. Previously, they would be included, but disabled in that case, which is unnecessary. --- nixos/modules/config/console.nix | 14 ++++---------- nixos/modules/services/ttys/getty.nix | 11 ++++++++++- nixos/modules/system/boot/systemd.nix | 9 --------- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix index 9beb7dc58703..b5b03637d884 100644 --- a/nixos/modules/config/console.nix +++ b/nixos/modules/config/console.nix @@ -128,16 +128,6 @@ in ''); } - (lib.mkIf (!cfg.enable) { - systemd.services = { - "serial-getty@ttyS0".enable = false; - "serial-getty@hvc0".enable = false; - "getty@tty1".enable = false; - "autovt@".enable = false; - systemd-vconsole-setup.enable = false; - }; - }) - (lib.mkIf cfg.enable (lib.mkMerge [ { environment.systemPackages = [ pkgs.kbd ]; @@ -178,6 +168,10 @@ in "${cfg.keyMap}" ]; + systemd.additionalUpstreamSystemUnits = [ + "systemd-vconsole-setup.service" + ]; + systemd.services.reload-systemd-vconsole-setup = { description = "Reset console on configuration changes"; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/ttys/getty.nix b/nixos/modules/services/ttys/getty.nix index fd9bd7aca019..60cf8fe30171 100644 --- a/nixos/modules/services/ttys/getty.nix +++ b/nixos/modules/services/ttys/getty.nix @@ -120,12 +120,21 @@ in ###### implementation - config = { + config = mkIf config.console.enable { # Note: this is set here rather than up there so that changing # nixos.label would not rebuild manual pages services.getty.greetingLine = mkDefault ''<<< Welcome to ${config.system.nixos.distroName} ${config.system.nixos.label} (\m) - \l >>>''; services.getty.helpLine = mkIf (config.documentation.nixos.enable && config.documentation.doc.enable) "\nRun 'nixos-help' for the NixOS manual."; + systemd.additionalUpstreamSystemUnits = [ + "getty.target" + "getty-pre.target" + "getty@.service" + "serial-getty@.service" + "console-getty.service" + "container-getty@.service" + ]; + systemd.services."getty@" = { serviceConfig.ExecStart = [ # override upstream default with an empty ExecStart diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 9260bc22b13e..4f77a8137cc4 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -60,15 +60,6 @@ let # hwdb.bin is managed by NixOS # "systemd-hwdb-update.service" - # Consoles. - "getty.target" - "getty-pre.target" - "getty@.service" - "serial-getty@.service" - "console-getty.service" - "container-getty@.service" - "systemd-vconsole-setup.service" - # Hardware (started by udev when a relevant device is plugged in). "sound.target" "bluetooth.target" From b7352212f8ce5de214da7c4296b7bcd59de37d43 Mon Sep 17 00:00:00 2001 From: Nathan Henrie Date: Thu, 16 Jan 2025 17:22:28 -0700 Subject: [PATCH 02/53] espanso: fix darwin build failure due to vendored wx Vendored wx has a libpng that refers to which breaks with clang-19 This patch changes it to use libpng from nixpkgs instead. See also: https://github.com/NixOS/nixpkgs/pull/362685 --- pkgs/by-name/es/espanso/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/es/espanso/package.nix b/pkgs/by-name/es/espanso/package.nix index 10d2f31bce25..35a4b7e71754 100644 --- a/pkgs/by-name/es/espanso/package.nix +++ b/pkgs/by-name/es/espanso/package.nix @@ -11,6 +11,7 @@ libXtst, libnotify, libxkbcommon, + libpng, openssl, xclip, xdotool, @@ -28,7 +29,7 @@ assert stdenv.hostPlatform.isLinux -> x11Support != waylandSupport; assert stdenv.hostPlatform.isDarwin -> !x11Support; assert stdenv.hostPlatform.isDarwin -> !waylandSupport; -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "espanso"; version = "2.2-unstable-2024-05-14"; @@ -71,6 +72,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ + libpng wxGTK32 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ @@ -99,6 +101,9 @@ rustPlatform.buildRustPackage rec { --replace-fail "espanso" "${placeholder "out"}/Applications/Espanso.app/Contents/MacOS/espanso" substituteInPlace espanso/src/path/macos.rs espanso/src/path/linux.rs \ --replace-fail '"/usr/local/bin/espanso"' '"${placeholder "out"}/bin/espanso"' + + substituteInPlace espanso-modulo/build.rs \ + --replace-fail '"--with-libpng=builtin"' '"--with-libpng=sys"' ''; # Some tests require networking From 41be7e0a77143e19e0a13d35d847b77c4bd35cae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Feb 2025 15:43:33 +0000 Subject: [PATCH 03/53] hyprlandPlugins.hypr-dynamic-cursors: 0-unstable-2025-01-27 -> 0-unstable-2025-02-02 --- .../hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix index d6155639033e..fd3ffbd36b17 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix @@ -8,13 +8,13 @@ mkHyprlandPlugin hyprland { pluginName = "hypr-dynamic-cursors"; - version = "0-unstable-2025-01-27"; + version = "0-unstable-2025-02-02"; src = fetchFromGitHub { owner = "VirtCode"; repo = "hypr-dynamic-cursors"; - rev = "4d1d88522bbeefd07a9113dd5449a0a288d11ba8"; - hash = "sha256-BTYq6SDfUvhLH/Zjc0sGr19m5qnjB9Vn3OfIpxumsyk="; + rev = "fd6214629937949ecd8a39f4b5ebbce2afac0dd5"; + hash = "sha256-Fg4+6Yko8V9b19/62jfKH0IWTiiRDMso1P1TnjAcs/8="; }; dontUseCmakeConfigure = true; From 3781c5e8db5fd3b0b7455398e613158795816197 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Feb 2025 14:47:11 +0000 Subject: [PATCH 04/53] gdal: 3.10.1 -> 3.10.2 --- pkgs/development/libraries/gdal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index c9835f6c997b..4e2000b85de4 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -83,13 +83,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal"; - version = "3.10.1"; + version = "3.10.2"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${finalAttrs.version}"; - hash = "sha256-4XUDHN1RJPgURwTFPFu/9QRqW6XhLMydti9CRO6p7SI="; + hash = "sha256-PanWqieJU1opR8iAwGsAeAt5cPXNOkwT5E6D6xPNCWs="; }; nativeBuildInputs = From d40f8a170b6c70fff374937242344ddbff72bdcd Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Sat, 15 Feb 2025 14:22:25 +0100 Subject: [PATCH 05/53] dependency-track: nix-update specify frontend subpackage exec --- pkgs/by-name/de/dependency-track/package.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/dependency-track/package.nix b/pkgs/by-name/de/dependency-track/package.nix index 579fb99badf0..41ada6fbcf40 100644 --- a/pkgs/by-name/de/dependency-track/package.nix +++ b/pkgs/by-name/de/dependency-track/package.nix @@ -106,11 +106,16 @@ maven.buildMavenPackage rec { passthru = { # passthru for nix-update - inherit (frontend) npmDeps; + inherit frontend; tests = { inherit (nixosTests) dependency-track; }; - updateScript = nix-update-script { }; + updateScript = nix-update-script { + extraArgs = [ + "-s" + "frontend" + ]; + }; }; meta = { From 43c92a3a0ef7119675e209a23948e769439fb2e7 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 16 Feb 2025 16:06:37 +0000 Subject: [PATCH 06/53] btrfs-progs: 6.12 -> 6.13 Changes: https://github.com/kdave/btrfs-progs/releases/tag/v6.13 --- pkgs/by-name/bt/btrfs-progs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bt/btrfs-progs/package.nix b/pkgs/by-name/bt/btrfs-progs/package.nix index 93b7916135be..d5f78c750e00 100644 --- a/pkgs/by-name/bt/btrfs-progs/package.nix +++ b/pkgs/by-name/bt/btrfs-progs/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "6.12"; + version = "6.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - hash = "sha256-mn2WUf/VL75SEqjkhSo82weePSI/xVBOalCwupbNIKE="; + hash = "sha256-ZbPyERellPgAE7QyYg7sxqfisMBeq5cTb/UGx01z7po="; }; nativeBuildInputs = From c9823d7a6467f29ab711d20b7da423cd7bbf35dc Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 15 Feb 2025 13:40:29 +0100 Subject: [PATCH 07/53] libreoffice: skip tests broken on aarch64 --- .../office/libreoffice/skip-broken-tests-fresh.patch | 10 ++++++++++ .../office/libreoffice/skip-broken-tests-still.patch | 8 ++++++++ .../office/libreoffice/skip-broken-tests.patch | 10 ++++++++++ 3 files changed, 28 insertions(+) diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch b/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch index f1cd5c261d04..7662ad61f8d6 100644 --- a/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch +++ b/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch @@ -114,3 +114,13 @@ saveAsPDF(u"tdf164106.fodt"); auto pPdfDocument = parsePDFExport(); +--- a/unoxml/qa/unit/rdftest.cxx ++++ b/unoxml/qa/unit/rdftest.cxx +@@ -962,6 +962,7 @@ + + CPPUNIT_TEST_FIXTURE(RDFStreamTest, testDocumentMetadataAccess) + { ++ return; // fails on aarch64 + loadFromURL(u"private:factory/swriter"_ustr); + + uno::Reference xDocumentMetadataAccess(mxComponent, diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch b/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch index c3442d43c485..24d4cdeeaee8 100644 --- a/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch +++ b/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch @@ -19,6 +19,14 @@ loadFromFile(u"validity.xlsx"); // .uno:Save modifies the original file, make a copy first +@@ -3212,6 +3213,7 @@ CPPUNIT_TEST_FIXTURE(ScTiledRenderingTest, testUndoReorderingMulti) + + CPPUNIT_TEST_FIXTURE(ScTiledRenderingTest, testGetViewRenderState) + { ++ return; // fails on aarch64 + // Add a pair of schemes, last added is the default + svtools::EditableColorConfig aColorConfig; + aColorConfig.AddScheme(u"Dark"_ustr); --- a/sc/qa/unit/ucalc_formula.cxx +++ b/sc/qa/unit/ucalc_formula.cxx @@ -1507,6 +1507,8 @@ CPPUNIT_TEST_FIXTURE(TestFormula, testFormulaAnnotateTrimOnDoubleRefs) diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests.patch b/pkgs/applications/office/libreoffice/skip-broken-tests.patch index 959510958a7e..1c522dda5794 100644 --- a/pkgs/applications/office/libreoffice/skip-broken-tests.patch +++ b/pkgs/applications/office/libreoffice/skip-broken-tests.patch @@ -121,3 +121,13 @@ createSwDoc(); SwDoc* pDoc = getSwDoc(); CPPUNIT_ASSERT(pDoc); +--- a/sw/qa/extras/odfexport/odfexport2.cxx ++++ b/sw/qa/extras/odfexport/odfexport2.cxx +@@ -1711,6 +1711,7 @@ CPPUNIT_TEST_FIXTURE(Test, testMidnightRedlineDatetime) + // - Error: "2001-01-01" does not satisfy the "dateTime" type + // because "2001-01-01T00:00:00" became "2001-01-01" on roundtrip. + loadAndReload("midnight_redline.fodt"); ++ return; // fails on aarch64 + + xmlDocUniquePtr pXmlDoc = parseExport(u"content.xml"_ustr); + assertXPathContent(pXmlDoc, From 8424265bce0518a9732bf7fd4b1927330d894b43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Feb 2025 22:51:35 +0000 Subject: [PATCH 08/53] quarkus: 3.18.1 -> 3.18.3 --- pkgs/by-name/qu/quarkus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix index 29d720a5e0da..59f090ba6a1e 100644 --- a/pkgs/by-name/qu/quarkus/package.nix +++ b/pkgs/by-name/qu/quarkus/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "quarkus-cli"; - version = "3.18.1"; + version = "3.18.3"; src = fetchurl { url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz"; - hash = "sha256-GRDi8+/tpA39to6bUpY4rxrmYeuF3J4MmLAsDWM7OWw="; + hash = "sha256-hdcst+g6jlHD9tOh3UrtT4kc7vro2Jd/eTlSZkB+8L4="; }; nativeBuildInputs = [ makeWrapper ]; From 929d8601ea6d7aa4c423e9320b95fa7569852e4a Mon Sep 17 00:00:00 2001 From: r-vdp Date: Mon, 17 Feb 2025 00:38:43 +0100 Subject: [PATCH 09/53] alacritty: 0.15.0 -> 0.15.1 https://github.com/alacritty/alacritty/releases/tag/v0.15.1 --- pkgs/by-name/al/alacritty/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix index cef0cfb9ffc0..6fd102d45387 100644 --- a/pkgs/by-name/al/alacritty/package.nix +++ b/pkgs/by-name/al/alacritty/package.nix @@ -44,17 +44,17 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "alacritty"; repo = "alacritty"; tag = "v${version}"; - hash = "sha256-CAxf0ltvYXYTdjQmLQnRwRRJUBgABbHSB8DxfAbgBdo="; + hash = "sha256-/yERMNfCFLPb1S17Y9OacVH8UobDIIZDhM2qPzf5Vds="; }; useFetchCargoVendor = true; - cargoHash = "sha256-5AIl/z9OHSBs0DRk4UD03Yrvb6Ib5FGJk9XCRCKsjTs="; + cargoHash = "sha256-uXwefUV1NAKqwwPIWj4Slkx0c5b+RfLR3caTb42fc4M="; nativeBuildInputs = [ cmake From 7ef4e646ebc0a48a685a75274d2d9c156a0f604a Mon Sep 17 00:00:00 2001 From: gale Date: Sun, 16 Feb 2025 23:39:21 -0600 Subject: [PATCH 10/53] slimevr: fix libappindicator patching --- pkgs/by-name/sl/slimevr/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sl/slimevr/package.nix b/pkgs/by-name/sl/slimevr/package.nix index 4b9590c14665..083938fb1756 100644 --- a/pkgs/by-name/sl/slimevr/package.nix +++ b/pkgs/by-name/sl/slimevr/package.nix @@ -91,7 +91,7 @@ rustPlatform.buildRustPackage rec { '' + lib.optionalString stdenv.hostPlatform.isLinux '' # Both libappindicator-rs and SlimeVR need to know where Nix's appindicator lib is. - pushd $cargoDepsCopy/libappindicator-sys + pushd $cargoDepsCopy/libappindicator-sys-* oldHash=$(sha256sum src/lib.rs | cut -d " " -f 1) substituteInPlace src/lib.rs \ --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" From f486df02f71c8138389b4406cd645f3017c07a96 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Mon, 17 Feb 2025 12:58:23 +0100 Subject: [PATCH 11/53] jellyfin-web: 10.10.5 -> 10.10.6 --- pkgs/by-name/je/jellyfin-web/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix index c85fc945989b..8d9dd0f657dc 100644 --- a/pkgs/by-name/je/jellyfin-web/package.nix +++ b/pkgs/by-name/je/jellyfin-web/package.nix @@ -13,7 +13,7 @@ }: buildNpmPackage rec { pname = "jellyfin-web"; - version = "10.10.5"; + version = "10.10.6"; src = assert version == jellyfin.version; @@ -21,7 +21,7 @@ buildNpmPackage rec { owner = "jellyfin"; repo = "jellyfin-web"; rev = "v${version}"; - hash = "sha256-bmLEFnP5HalQ7w42pTJt4iV7uISLnMrOsrXKjPAezog"; + hash = "sha256-A6Y4tAJtocfRZ8R8Sio1RhgIDfvRG4Mk2JMhz2QZNwo="; }; nodejs = nodejs_20; # does not build with 22 @@ -31,7 +31,7 @@ buildNpmPackage rec { --replace-fail "git describe --always --dirty" "echo ${src.rev}" \ ''; - npmDepsHash = "sha256-MoXE7hzavOS86UjLzpJtSQxded98YjL4h7L1IC5KLas"; + npmDepsHash = "sha256-ggRbZ7vjFe4KG+amcLEcjiZMtUc0JwSZoiKE9qwy0y4="; preBuild = '' # using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart From 7a797c2a28780fdf729766a8e38f0bae4c03ab32 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Mon, 17 Feb 2025 12:58:38 +0100 Subject: [PATCH 12/53] jellyfin: 10.10.5 -> 10.10.6 --- pkgs/by-name/je/jellyfin/nuget-deps.json | 4 ++-- pkgs/by-name/je/jellyfin/package.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/je/jellyfin/nuget-deps.json b/pkgs/by-name/je/jellyfin/nuget-deps.json index c3532ce18f53..699cc8c76b3a 100644 --- a/pkgs/by-name/je/jellyfin/nuget-deps.json +++ b/pkgs/by-name/je/jellyfin/nuget-deps.json @@ -1246,8 +1246,8 @@ }, { "pname": "z440.atl.core", - "version": "6.11.0", - "hash": "sha256-V1r1ftZ/Ud0pw/qwnqpJodRaGi9FyG3uIy3ykJUvxjg=" + "version": "6.16.0", + "hash": "sha256-J8Orzt/H84IscHZ9p7hEja7bkweuLsZNqu9XzmUjQM0=" }, { "pname": "zlib.net-mutliplatform", diff --git a/pkgs/by-name/je/jellyfin/package.nix b/pkgs/by-name/je/jellyfin/package.nix index 90e509d30bcd..487c6fd34ecd 100644 --- a/pkgs/by-name/je/jellyfin/package.nix +++ b/pkgs/by-name/je/jellyfin/package.nix @@ -13,13 +13,13 @@ buildDotnetModule rec { pname = "jellyfin"; - version = "10.10.5"; # ensure that jellyfin-web has matching version + version = "10.10.6"; # ensure that jellyfin-web has matching version src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin"; rev = "v${version}"; - hash = "sha256-fXjQ8h//C0Ox5pyyFazpcuVLZibKAbnXcY6OHLI2bDQ="; + hash = "sha256-QFXZtmdR07xIjh4wKgbx1usXgRg5X0jfzzLjsxKMniU="; }; propagatedBuildInputs = [ sqlite ]; From 16af17553a39a5cf85aedc20a0416703e66414a9 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 17 Feb 2025 15:12:53 -0300 Subject: [PATCH 13/53] cosmic-wallpapers: 1.0.0-alpha.5 -> 1.0.0-alpha.5.1 (no-op) --- pkgs/by-name/co/cosmic-wallpapers/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/cosmic-wallpapers/package.nix b/pkgs/by-name/co/cosmic-wallpapers/package.nix index de370d6da187..69b6bcc8ddc7 100644 --- a/pkgs/by-name/co/cosmic-wallpapers/package.nix +++ b/pkgs/by-name/co/cosmic-wallpapers/package.nix @@ -8,7 +8,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cosmic-wallpapers"; - version = "1.0.0-alpha.5"; + version = "1.0.0-alpha.5.1"; src = fetchFromGitHub { owner = "pop-os"; From 3d75d47c5f36f425319a51d726895bfe551f3ac8 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Mon, 17 Feb 2025 15:14:27 -0300 Subject: [PATCH 14/53] cosmic-wallpapers: add HeitorAugustoLN as a maintainer --- pkgs/by-name/co/cosmic-wallpapers/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/co/cosmic-wallpapers/package.nix b/pkgs/by-name/co/cosmic-wallpapers/package.nix index 69b6bcc8ddc7..0b4535200c3c 100644 --- a/pkgs/by-name/co/cosmic-wallpapers/package.nix +++ b/pkgs/by-name/co/cosmic-wallpapers/package.nix @@ -50,7 +50,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { # round_moons_nasa.jpg: https://www.planetary.org/space-images/the-solar-systems-round-moons publicDomain ]; - maintainers = with lib.maintainers; [ pandapip1 ]; + maintainers = with lib.maintainers; [ + pandapip1 + HeitorAugustoLN + ]; platforms = lib.platforms.unix; }; }) From 5a25bc6270269c545f0c5dac1f5a189cf67d3e15 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 17 Feb 2025 19:33:33 +0100 Subject: [PATCH 15/53] rmg: 0.6.7 -> 0.7.5 --- pkgs/by-name/rm/rmg/package.nix | 81 +++++++++++++++++---------------- 1 file changed, 42 insertions(+), 39 deletions(-) diff --git a/pkgs/by-name/rm/rmg/package.nix b/pkgs/by-name/rm/rmg/package.nix index ff31b95c13b5..8162925b2ef1 100644 --- a/pkgs/by-name/rm/rmg/package.nix +++ b/pkgs/by-name/rm/rmg/package.nix @@ -15,6 +15,7 @@ pkg-config, qt6Packages, SDL2, + SDL2_net, speexdsp, vulkan-headers, vulkan-loader, @@ -26,77 +27,79 @@ withAngrylionRdpPlus ? false, }: -let - inherit (qt6Packages) - qtbase - qtsvg - qtwayland - wrapQtAppsHook - ; -in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rmg"; - version = "0.6.7"; + version = "0.7.5"; src = fetchFromGitHub { owner = "Rosalie241"; repo = "RMG"; - rev = "v${version}"; - hash = "sha256-4tL8x3Mb48VhzQpubSiETbkyas2+a0RL1SDNsEO7iJk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-sjjGFV2Pse1sNWYpmu5+Y0ePB738S7jPOzFCmmeCPXA="; }; nativeBuildInputs = [ cmake nasm pkg-config - wrapQtAppsHook + qt6Packages.wrapQtAppsHook which ]; - buildInputs = [ - boost - discord-rpc - freetype - hidapi - libpng - libsamplerate - minizip - qtbase - qtsvg - SDL2 - speexdsp - vulkan-headers - vulkan-loader - xdg-user-dirs - zlib - ] ++ lib.optional withWayland qtwayland; + buildInputs = + [ + boost + discord-rpc + freetype + hidapi + libpng + libsamplerate + minizip + SDL2 + SDL2_net + speexdsp + vulkan-headers + vulkan-loader + xdg-user-dirs + zlib + ] + ++ ( + with qt6Packages; + [ + qtbase + qtsvg + qtwebsockets + ] + ++ lib.optional withWayland qtwayland + ); cmakeFlags = [ - "-DPORTABLE_INSTALL=OFF" + (lib.cmakeBool "PORTABLE_INSTALL" false) # mupen64plus-input-gca is written in Rust, so we can't build it with # everything else. - "-DNO_RUST=ON" - "-DUSE_ANGRYLION=${lib.boolToString withAngrylionRdpPlus}" + (lib.cmakeBool "NO_RUST" true) + (lib.cmakeBool "USE_ANGRYLION" withAngrylionRdpPlus) ]; qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}" ] - ++ lib.optional withWayland "--set RMG_WAYLAND 1"; + ++ lib.optional withWayland "--set RMG_ALLOW_WAYLAND 1"; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; - meta = with lib; { + meta = { homepage = "https://github.com/Rosalie241/RMG"; + changelog = "https://github.com/Rosalie241/RMG/releases/tag/v${finalAttrs.version}"; description = "Rosalie's Mupen GUI"; longDescription = '' Rosalie's Mupen GUI is a free and open-source mupen64plus front-end written in C++. It offers a simple-to-use user interface. ''; - license = if withAngrylionRdpPlus then licenses.unfree else licenses.gpl3Only; - platforms = platforms.linux; + license = if withAngrylionRdpPlus then lib.licenses.unfree else lib.licenses.gpl3Only; + platforms = lib.platforms.linux; mainProgram = "RMG"; - maintainers = with maintainers; [ slam-bert ]; + maintainers = with lib.maintainers; [ slam-bert ]; }; -} +}) From 2dc66dedcb314022e4eae29b3f309ba6094bf775 Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Sat, 15 Feb 2025 15:03:08 +0100 Subject: [PATCH 16/53] dependency-track: 4.12.2 -> 4.12.5 --- pkgs/by-name/de/dependency-track/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/de/dependency-track/package.nix b/pkgs/by-name/de/dependency-track/package.nix index 41ada6fbcf40..a9ba99b952c2 100644 --- a/pkgs/by-name/de/dependency-track/package.nix +++ b/pkgs/by-name/de/dependency-track/package.nix @@ -12,7 +12,7 @@ nixosTests, }: let - version = "4.12.2"; + version = "4.12.5"; frontend = buildNpmPackage { pname = "dependency-track-frontend"; @@ -25,10 +25,10 @@ let owner = "DependencyTrack"; repo = "frontend"; rev = version; - hash = "sha256-M7UtyhIuEi6ebkjO8OM0VVi8LQ+VqeVIzBgQwIzSAzg="; + hash = "sha256-BCnWDu9DbZgzMKONtY5ZRZepvBgbHKAeXD+7n7cop6Q="; }; - npmDepsHash = "sha256-ZU5D3ZXLaZ1m2YP6uZmpzahP2JQPL9tdOHOyN9fp/XA="; + npmDepsHash = "sha256-RRx3oOAL178fXhEs2ihng3l/OuZnEqk1W7vhHCpWRZQ="; forceGitDeps = true; makeCacheWritable = true; @@ -45,7 +45,7 @@ maven.buildMavenPackage rec { owner = "DependencyTrack"; repo = "dependency-track"; rev = version; - hash = "sha256-wn4HnOFhV02oq66LwBIOVzU+ehXemCuzOWcDASG/47c="; + hash = "sha256-nprAY8GinSkzgSIe3KKNQjv5hCXCHQrGcIZEaoWxw6I="; }; patches = [ @@ -60,7 +60,7 @@ maven.buildMavenPackage rec { ''; mvnJdk = jre_headless; - mvnHash = "sha256-x1/b8LoXyGxCQiu7QB60XSpiufTk/y4492mOraFnRKY="; + mvnHash = "sha256-5R+k+h6biY9xt8g6WdTtQ94sSywluQcrFTcYZbw4JgA="; manualMvnArtifacts = [ "com.coderplus.maven.plugins:copy-rename-maven-plugin:1.0.1" ]; buildOffline = true; From cac79ca847f28319998791048c1c479fd6d6180e Mon Sep 17 00:00:00 2001 From: merrkry Date: Mon, 17 Feb 2025 21:58:53 +0100 Subject: [PATCH 17/53] linuxKernel.kernels.linux_zen: 6.13.1-zen1 -> 6.13.3-zen1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index b3c123022de9..9a65b450edf0 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -12,9 +12,9 @@ let variants = { # ./update-zen.py zen zen = { - version = "6.13.1"; # zen + version = "6.13.3"; # zen suffix = "zen1"; # zen - sha256 = "1n22hsjl77qby2s4wf9y6z3kbcw7yziiniv2x43xixgkl12ajvk5"; # zen + sha256 = "1z7zmvppdl77zn66lcf8fsrlsm56lz2xjimzwsc30vs8jgp91rq0"; # zen isLqx = false; }; # ./update-zen.py lqx From 0358fbb538ff8ea0c8cad3edb3c93a9611122dfd Mon Sep 17 00:00:00 2001 From: merrkry Date: Mon, 17 Feb 2025 22:08:15 +0100 Subject: [PATCH 18/53] linuxKernel.kernels.linux_lqx: 6.12.10-lqx1 -> 6.12.14-lqx1 placeholder --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 9a65b450edf0..eebf9e51e36a 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -19,9 +19,9 @@ let }; # ./update-zen.py lqx lqx = { - version = "6.12.10"; # lqx + version = "6.12.14"; # lqx suffix = "lqx1"; # lqx - sha256 = "0sg905xdyy9wmjqv6d8p5jr307j767wgk27gzxhq8dnb2dz2yg5v"; # lqx + sha256 = "097pg0qaqiy75fdgq92vhj4bxk19q3385x67dl4wclfkfrfn5fiv"; # lqx isLqx = true; }; }; From 7cdab27d09af5f92852afdaa74ba201c86a99782 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Tue, 18 Feb 2025 09:23:59 +1100 Subject: [PATCH 19/53] python312Packages.blosc2: torch is no used when testing wheels https://github.com/omaech/python-blosc2/commit/1b695da7ef53d7a72c8267866b284b175021b34c --- pkgs/development/python-modules/blosc2/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/blosc2/default.nix b/pkgs/development/python-modules/blosc2/default.nix index 906127d9bb94..611303a52016 100644 --- a/pkgs/development/python-modules/blosc2/default.nix +++ b/pkgs/development/python-modules/blosc2/default.nix @@ -24,7 +24,6 @@ # tests psutil, pytestCheckHook, - torch, }: buildPythonPackage rec { @@ -69,7 +68,6 @@ buildPythonPackage rec { nativeCheckInputs = [ psutil pytestCheckHook - torch ]; disabledTests = [ From 48c9e493f087eecec9b78a0318f0adb5df4cca88 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Tue, 18 Feb 2025 10:12:33 +1100 Subject: [PATCH 20/53] python312Packages.mayavi: fix build, pin to numpy_1 --- pkgs/development/python-modules/mayavi/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix index f5099af1f8f9..540b401fcbe6 100644 --- a/pkgs/development/python-modules/mayavi/default.nix +++ b/pkgs/development/python-modules/mayavi/default.nix @@ -4,7 +4,7 @@ buildPythonPackage, envisage, fetchPypi, - numpy, + numpy_1, packaging, pyface, pygments, @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ apptools envisage - numpy + numpy_1 packaging pyface pygments diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index af53309e3a83..73c86573a39e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8068,7 +8068,9 @@ self: super: with self; { mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi { inherit buildPythonPackage pythonOlder pythonAtLeast; - inherit (self) pyface pygments numpy packaging vtk traitsui envisage apptools pyqt5; + # when next release contains numpy2 support unpin + # https://github.com/enthought/mayavi/pull/1315 + inherit (self) pyface pygments numpy_1 packaging vtk traitsui envisage apptools pyqt5; }; mayim = callPackage ../development/python-modules/mayim { }; From ef86ddbafdbf2b7ba3178b6acf2e34100464c377 Mon Sep 17 00:00:00 2001 From: Dillon Beliveau Date: Mon, 17 Feb 2025 15:50:14 -0800 Subject: [PATCH 21/53] bicep: 0.32.4 -> 0.33.93, add Bicep.LangServer --- pkgs/by-name/bi/bicep/deps.json | 384 +++++++++++++++++++++++------- pkgs/by-name/bi/bicep/package.nix | 9 +- 2 files changed, 308 insertions(+), 85 deletions(-) diff --git a/pkgs/by-name/bi/bicep/deps.json b/pkgs/by-name/bi/bicep/deps.json index 2deefcd34520..47e0375287cb 100644 --- a/pkgs/by-name/bi/bicep/deps.json +++ b/pkgs/by-name/bi/bicep/deps.json @@ -11,8 +11,8 @@ }, { "pname": "Azure.Bicep.Types.Az", - "version": "0.2.727", - "hash": "sha256-TIotyz+BRcUjUCyHUIalNZNP4pMzkKmZXRiRFeEm7fg=" + "version": "0.2.737", + "hash": "sha256-eqjucNfQg8kJ4PCSBBtl+9ddv0xyfKvBQMbIEE9FWg8=" }, { "pname": "Azure.Bicep.Types.K8s", @@ -24,6 +24,11 @@ "version": "1.1.1", "hash": "sha256-BC7QlrtYz74yDtTf/Kvf+Y3Vm3NEZsJLO5g5twKuxkI=" }, + { + "pname": "Azure.Core", + "version": "1.28.0", + "hash": "sha256-mEulHd88jjFglFVTn6zVSue/aqDYWds40glal9L1af8=" + }, { "pname": "Azure.Core", "version": "1.36.0", @@ -41,28 +46,28 @@ }, { "pname": "Azure.Deployments.Core", - "version": "1.195.0", - "hash": "sha256-pFJeujdVzPFoUknQStQCuBEbgmyq/9uZRsa3jAbRxIM=" + "version": "1.224.0", + "hash": "sha256-T6z0ZTanppSVlsPMmtSiVdNJWReAg+snvM4qvMgNNNk=" }, { "pname": "Azure.Deployments.DiffEngine", - "version": "1.195.0", - "hash": "sha256-UD3/kPgBGSXX+4GzEZ6uGCe0O7sJKcy5kWwTG/dtt7U=" + "version": "1.224.0", + "hash": "sha256-Ca6iHQv6/BPHJt0EV/HZTUc5L+bCrX4iqQK8gtrj7Ho=" }, { "pname": "Azure.Deployments.Engine", - "version": "1.195.0", - "hash": "sha256-KHrC/lq3syrIsZIqa8a4M6+pLChM1lNsbzH5NTxNyIc=" + "version": "1.224.0", + "hash": "sha256-crlmLUXHCzt0zqJTfulR2rttXxOgtLmo1JnO56VMhYQ=" }, { "pname": "Azure.Deployments.Expression", - "version": "1.195.0", - "hash": "sha256-U1jux2UH1vPqr4i/HBw3bupiSUWaavwU0b/rKC63muI=" + "version": "1.224.0", + "hash": "sha256-P0bncRi4VntjtNQHNZL02fa2tH8aho1Y0+lxvssY5AM=" }, { "pname": "Azure.Deployments.Extensibility", - "version": "1.195.0", - "hash": "sha256-ai6LoMWLh8JssNStAdvZzFe+zLkiDztLhP2ZGW8wA44=" + "version": "1.224.0", + "hash": "sha256-Dwo5xeXjwkvPA4mebl45kSgtb+kpauo9qbVTtcIhFkQ=" }, { "pname": "Azure.Deployments.Extensibility.Core", @@ -86,8 +91,8 @@ }, { "pname": "Azure.Deployments.Templates", - "version": "1.195.0", - "hash": "sha256-WxkWqXjVEsARsWzC13l6gID72a+xP0QeQ7u9IU18Mlo=" + "version": "1.224.0", + "hash": "sha256-4O4tUhuWhEQpw3UywSbUQvvTOUNION7sZHGEZ8M1xWo=" }, { "pname": "Azure.Identity", @@ -99,6 +104,16 @@ "version": "1.13.0", "hash": "sha256-pWjp8mjGikgJvTXCslF/sjXURq3rB36JkiTWHYJIWV0=" }, + { + "pname": "Azure.ResourceManager", + "version": "1.4.0", + "hash": "sha256-jwJf9JlL5JcsLkK87VeU7Y3njvZt3PoT7LIdQygGiIQ=" + }, + { + "pname": "Azure.ResourceManager.ResourceGraph", + "version": "1.0.1", + "hash": "sha256-PSazvdFwF9XwsJ3a6Df4fykDs66Vs3sDu3AbOyYgIc4=" + }, { "pname": "Azure.ResourceManager.Resources", "version": "1.9.0", @@ -111,38 +126,38 @@ }, { "pname": "coverlet.collector", - "version": "6.0.2", - "hash": "sha256-LdSQUrOmjFug47LjtqgtN2MM6BcfG0HR5iL+prVHlDo=" + "version": "6.0.3", + "hash": "sha256-gQ2u3hJggz89UVoU3P7m/riu1SkN1hu316iyrodTqt8=" }, { "pname": "FluentAssertions", - "version": "6.12.2", - "hash": "sha256-yvbnZapTF610zG8YhMOESn0iXudX4xVCdoSKVo6eu+w=" + "version": "7.0.0", + "hash": "sha256-V59UdvyZPfudHdlreApibs1KXYKJnTWmTPKuhm+pbK0=" }, { "pname": "Google.Protobuf", - "version": "3.28.3", - "hash": "sha256-jiA/FeYEEk/u9O1gtdnOzatym+/uHyaRJSdp34TOb1o=" + "version": "3.29.2", + "hash": "sha256-gSnkG1pHeLJStWp2fUBRO4eJvvSFYQrbhrLvgYh30YM=" }, { "pname": "Grpc.Core.Api", - "version": "2.66.0", - "hash": "sha256-XVZmvlUK0t4bWaIBUAoAm007VhUdUvSSlCDh6P4IV9c=" + "version": "2.67.0", + "hash": "sha256-e20szw18ddOV4euAfsJEHr74HIVzdfjV5pYvGpLVmn4=" }, { "pname": "Grpc.Net.Client", - "version": "2.66.0", - "hash": "sha256-bxK/5xFYWpqFmD8N79B79ymSt/u4aKRJkrO5I1ZxDgI=" + "version": "2.67.0", + "hash": "sha256-93Q3+bBl4Z4saeYq25uPFucrsdrm0fgFB+URiVRU6Ec=" }, { "pname": "Grpc.Net.Common", - "version": "2.66.0", - "hash": "sha256-M/GsAvCs1vQ29xLYtK1tuxOhk5MPm5lmwn+DPhfcgkA=" + "version": "2.67.0", + "hash": "sha256-czx/y3JgMmxXPL/LkqFcjXhAZRllFTW2rTnm7iLtSI4=" }, { "pname": "Grpc.Tools", - "version": "2.67.0", - "hash": "sha256-ms/lbWwb9UuJHNl3T5X2mAulCHhQ3tEiqRLWBfUYoV0=" + "version": "2.69.0", + "hash": "sha256-3nye4UcU2J7tnruKhoacD0S+fPN6d0A34K1yxlYrfxI=" }, { "pname": "Humanizer.Core", @@ -176,8 +191,8 @@ }, { "pname": "Json.More.Net", - "version": "2.0.2", - "hash": "sha256-a05C4llKu1sOBjjV+GXQqSD1FWaj7twjkx4L95qixDQ=" + "version": "2.1.0", + "hash": "sha256-AdQdfQa4nD5e1QCwiEiJOn/DGs5ogyaaTwN+14E/bho=" }, { "pname": "JsonDiffPatch.Net", @@ -191,8 +206,8 @@ }, { "pname": "JsonPatch.Net", - "version": "3.1.1", - "hash": "sha256-j8MZwl96BUPBSFnsb42d/JZIccDQQ1TvgBjqwafv9SQ=" + "version": "3.3.0", + "hash": "sha256-o9AHT43llgnlTIiQ+7YrZ5b06BDj9EExDuT3slHJ7qA=" }, { "pname": "JsonPath.Net", @@ -201,8 +216,8 @@ }, { "pname": "JsonPath.Net", - "version": "1.1.6", - "hash": "sha256-E9lXAJOPBZA3623ggLUKmtiG1AR/ldPtCBnH6TX6bOk=" + "version": "2.0.1", + "hash": "sha256-4UWnu5iTzOupiGYR6X9xoDQoF2KMJ30h2sn0p5TfUu4=" }, { "pname": "JsonPointer.Net", @@ -211,23 +226,28 @@ }, { "pname": "JsonPointer.Net", - "version": "5.0.2", - "hash": "sha256-S04fnxMCJm86yc1FYHSqHznhA+90NW6QI+7rxYIyhs0=" + "version": "5.2.0", + "hash": "sha256-Bn5AtyUxOz+p8JShDvfpzetWqscXwc/MJ85FcYXL9yQ=" }, { "pname": "JsonSchema.Net", "version": "7.0.4", "hash": "sha256-sCaGr8m20DzNEkF3TS7Cb+wmvo3hYZPZwQ2bTqwlB5g=" }, + { + "pname": "MediatR", + "version": "8.1.0", + "hash": "sha256-dyqhDG1NJjY1b+dj37sMmklGkxAm3zKdhh2lBJ0/HTM=" + }, { "pname": "MessagePack", - "version": "2.5.108", - "hash": "sha256-+vMXyEbfutY5WOFuFnNF24uLcKJTTdntVrVlSJH4yjI=" + "version": "2.5.187", + "hash": "sha256-3sBINhdkGdKPKTKxE4YuLGFHg6stAEHUIboR1g7eXgA=" }, { "pname": "MessagePack.Annotations", - "version": "2.5.108", - "hash": "sha256-u3Qu8UftNIz3oIzQUMa7Z0G6VzmDLcAnAeNQ3lB3YVk=" + "version": "2.5.187", + "hash": "sha256-SQCJa6u8coWMptbR9iQJLjoi/YkT9t0kJNbojh9vUPw=" }, { "pname": "Microsoft.ApplicationInsights", @@ -259,6 +279,11 @@ "version": "6.0.0", "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" }, + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "7.0.0", + "hash": "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE=" + }, { "pname": "Microsoft.Bcl.AsyncInterfaces", "version": "8.0.0", @@ -276,8 +301,8 @@ }, { "pname": "Microsoft.CodeCoverage", - "version": "17.11.1", - "hash": "sha256-1dLlK3NGh88PuFYZiYpT+izA96etxhU3BSgixDgdtGA=" + "version": "17.12.0", + "hash": "sha256-lGjifppD0OBMBp28pjUfPipaeXg739n8cPhtHWoo5RE=" }, { "pname": "Microsoft.CSharp", @@ -294,11 +319,26 @@ "version": "3.1.3", "hash": "sha256-MVKR1ZRpUMNdRAPuXh9cp5T/hG7wu8R9wUr9bey8V60=" }, + { + "pname": "Microsoft.Extensions.Configuration", + "version": "6.0.1", + "hash": "sha256-v55PAURxnSGYgbv9x+4/pMeI51H27ikRfHBuUB+N5nE=" + }, + { + "pname": "Microsoft.Extensions.Configuration", + "version": "8.0.0", + "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA=" + }, { "pname": "Microsoft.Extensions.Configuration", "version": "9.0.0", "hash": "sha256-uBLeb4z60y8z7NelHs9uT3cLD6wODkdwyfJm6/YZLDM=" }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "6.0.0", + "hash": "sha256-Evg+Ynj2QUa6Gz+zqF+bUyfGD0HI5A2fHmxZEXbn3HA=" + }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", "version": "8.0.0", @@ -309,6 +349,16 @@ "version": "9.0.0", "hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc=" }, + { + "pname": "Microsoft.Extensions.Configuration.Binder", + "version": "6.0.0", + "hash": "sha256-7NZcKkiXWSuhhVcA/fXHPY/62aGUyMsRdiHm91cWC5Y=" + }, + { + "pname": "Microsoft.Extensions.Configuration.Binder", + "version": "8.0.0", + "hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q=" + }, { "pname": "Microsoft.Extensions.Configuration.Binder", "version": "9.0.0", @@ -324,6 +374,11 @@ "version": "9.0.0", "hash": "sha256-qQn7Ol0CvPYuyecYWYBkPpTMdocO7I6n+jXQI2udzLI=" }, + { + "pname": "Microsoft.Extensions.DependencyInjection", + "version": "6.0.1", + "hash": "sha256-V+CulDoU3NXWn5EjH64JhDVQ0h+ev5BW95T+2uL1hU4=" + }, { "pname": "Microsoft.Extensions.DependencyInjection", "version": "8.0.1", @@ -336,8 +391,8 @@ }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "8.0.0", - "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8=" + "version": "6.0.0", + "hash": "sha256-SZke0jNKIqJvvukdta+MgIlGsrP2EdPkkS8lfLg7Ju4=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", @@ -379,11 +434,21 @@ "version": "8.0.1", "hash": "sha256-ScPwhBvD3Jd4S0E7JQ18+DqY3PtQvdFLbkohUBbFd3o=" }, + { + "pname": "Microsoft.Extensions.Logging", + "version": "6.0.0", + "hash": "sha256-8WsZKRGfXW5MsXkMmNVf6slrkw+cR005czkOP2KUqTk=" + }, { "pname": "Microsoft.Extensions.Logging", "version": "8.0.1", "hash": "sha256-vkfVw4tQEg86Xg18v6QO0Qb4Ysz0Njx57d1XcNuj6IU=" }, + { + "pname": "Microsoft.Extensions.Logging", + "version": "9.0.0", + "hash": "sha256-kR16c+N8nQrWeYLajqnXPg7RiXjZMSFLnKLEs4VfjcM=" + }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "6.0.0", @@ -394,16 +459,36 @@ "version": "8.0.2", "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc=" }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "9.0.0", + "hash": "sha256-iBTs9twjWXFeERt4CErkIIcoJZU1jrd1RWCI8V5j7KU=" + }, { "pname": "Microsoft.Extensions.ObjectPool", "version": "5.0.10", "hash": "sha256-tAjiU3w0hdPAGUitszxZ6jtEilRn977MY7N5eZMx0x0=" }, + { + "pname": "Microsoft.Extensions.Options", + "version": "6.0.0", + "hash": "sha256-DxnEgGiCXpkrxFkxXtOXqwaiAtoIjA8VSSWCcsW0FwE=" + }, { "pname": "Microsoft.Extensions.Options", "version": "8.0.2", "hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys=" }, + { + "pname": "Microsoft.Extensions.Options", + "version": "9.0.0", + "hash": "sha256-DT5euAQY/ItB5LPI8WIp6Dnd0lSvBRP35vFkOXC68ck=" + }, + { + "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", + "version": "6.0.0", + "hash": "sha256-au0Y13cGk/dQFKuvSA5NnP/++bErTk0oOTlgmHdI2Mw=" + }, { "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", "version": "8.0.0", @@ -414,6 +499,11 @@ "version": "5.0.1", "hash": "sha256-e4uoLnUSmON4If9qJh78+4z14IzW9qCu5YkqLdQqWQU=" }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "6.0.0", + "hash": "sha256-AgvysszpQ11AiTBJFkvSy8JnwIWTj15Pfek7T7ThUc4=" + }, { "pname": "Microsoft.Extensions.Primitives", "version": "8.0.0", @@ -446,13 +536,13 @@ }, { "pname": "Microsoft.NET.StringTools", - "version": "17.4.0", - "hash": "sha256-+9uBaUDZ3roUJwyYJUL30Mz+3C6LE16FzfQKgS0Yveo=" + "version": "17.6.3", + "hash": "sha256-H2Qw8x47WyFOd/VmgRmGMc+uXySgUv68UISgK8Frsjw=" }, { "pname": "Microsoft.NET.Test.Sdk", - "version": "17.11.1", - "hash": "sha256-0JUEucQ2lzaPgkrjm/NFLBTbqU1dfhvhN3Tl3moE6mI=" + "version": "17.12.0", + "hash": "sha256-DKFEbhh2wPzahNeHdEoFig8tZh/LEVrFc5+zpT43Btg=" }, { "pname": "Microsoft.NETCore.Platforms", @@ -474,6 +564,11 @@ "version": "3.1.0", "hash": "sha256-cnygditsEaU86bnYtIthNMymAHqaT/sf9Gjykhzqgb0=" }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "5.0.0", + "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=" + }, { "pname": "Microsoft.NETCore.Targets", "version": "1.0.1", @@ -494,6 +589,11 @@ "version": "7.0.0.2076", "hash": "sha256-SZ1T6ir1vBQMbRqhA2gujxjz01nWnf5wtrAJHVxd/Jo=" }, + { + "pname": "Microsoft.PowerPlatform.ResourceStack", + "version": "7.0.0.2080", + "hash": "sha256-dABBbYNretOIfVcvt437VZGPpBe4IYsAfkDMamJf2j0=" + }, { "pname": "Microsoft.SourceLink.Common", "version": "8.0.0", @@ -506,49 +606,59 @@ }, { "pname": "Microsoft.Testing.Extensions.Telemetry", - "version": "1.4.3", - "hash": "sha256-oZ+AsyGdjWDoYx+nkveuniU4yB1DZ3bjgOgnucEtbnc=" + "version": "1.5.3", + "hash": "sha256-bIXwPSa3jkr2b6xINOqMUs6/uj/r4oVFM7xq3uVIZDU=" }, { "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions", - "version": "1.4.3", - "hash": "sha256-Q3E2sfTL6VvuK1X2JQsNqUTS9AtpnH9mf2aXMj09bz8=" + "version": "1.5.3", + "hash": "sha256-IfMRfcyaIKEMRtx326ICKtinDBEfGw/Sv8ZHawJ96Yc=" }, { "pname": "Microsoft.Testing.Extensions.VSTestBridge", - "version": "1.4.3", - "hash": "sha256-Sjx7GBgLYtX0nmjmViZHWVHwIZnL8aj+ivDK58GbA8k=" + "version": "1.5.3", + "hash": "sha256-XpM/yFjhLSsuzyDV+xKubs4V1zVVYiV05E0+N4S1h0g=" }, { "pname": "Microsoft.Testing.Platform", - "version": "1.4.3", - "hash": "sha256-KqB3+uBGl0edpaGl6Qykubb3OrVTs6IcPWc59UQ/Iww=" + "version": "1.5.3", + "hash": "sha256-y61Iih6w5D79dmrj2V675mcaeIiHoj1HSa1FRit2BLM=" }, { "pname": "Microsoft.Testing.Platform.MSBuild", - "version": "1.4.3", - "hash": "sha256-289hhblU55kDvzbiSQAFSxOyht1MlXT4e+bEQyQqils=" + "version": "1.5.3", + "hash": "sha256-YspvjE5Jfi587TAfsvfDVJXNrFOkx1B3y1CKV6m7YLY=" }, { "pname": "Microsoft.TestPlatform.ObjectModel", - "version": "17.11.1", - "hash": "sha256-5vX+vCzFY3S7xfMVIv8OlMMFtdedW9UIJzc0WEc+vm4=" + "version": "17.12.0", + "hash": "sha256-3XBHBSuCxggAIlHXmKNQNlPqMqwFlM952Av6RrLw1/w=" }, { "pname": "Microsoft.TestPlatform.TestHost", - "version": "17.11.1", - "hash": "sha256-wSkY0H1fQAq0H3LcKT4u7Y5RzhAAPa6yueVN84g8HxU=" + "version": "17.12.0", + "hash": "sha256-rf8Sh0fQq44Sneuvs64unkkIHg8kOjDGWE35j9iLx5I=" }, { "pname": "Microsoft.VisualStudio.Threading", "version": "17.10.48", "hash": "sha256-WL8c7TjDBHGjsVLMMPf9cin8rirzOdxusEBQlkUfiVU=" }, + { + "pname": "Microsoft.VisualStudio.Threading", + "version": "17.6.40", + "hash": "sha256-5HtsgSPV5RdaPREGDvJ7qMOFubb1wMyHwkfTnZs9Zsc=" + }, { "pname": "Microsoft.VisualStudio.Threading.Analyzers", "version": "17.12.19", "hash": "sha256-7EteBGfUDOOpDihazJ4XGuPA2dvdc7HkpV8zTVl3FdQ=" }, + { + "pname": "Microsoft.VisualStudio.Validation", + "version": "17.6.11", + "hash": "sha256-Lkjp9Ove4+CFP06x/toYpJEiAinuTfn/o+oh0fW3pGM=" + }, { "pname": "Microsoft.VisualStudio.Validation", "version": "17.8.8", @@ -559,11 +669,21 @@ "version": "4.7.0", "hash": "sha256-+jWCwRqU/J/jLdQKDFm93WfIDrDMXMJ984UevaQMoi8=" }, + { + "pname": "Microsoft.Win32.Registry", + "version": "5.0.0", + "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA=" + }, { "pname": "Microsoft.Win32.Registry.AccessControl", "version": "8.0.0", "hash": "sha256-F2/VVsc5c3RpsraXAx63P8OdZA61Hh1HbirYI3U1FT4=" }, + { + "pname": "Microsoft.Win32.SystemEvents", + "version": "6.0.0", + "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA=" + }, { "pname": "Microsoft.Win32.SystemEvents", "version": "8.0.0", @@ -574,20 +694,35 @@ "version": "8.0.10", "hash": "sha256-VlLNyPBhHsg96Oq3Z8/bxK0iaSQqiUsQ+hQo3rGD3FU=" }, + { + "pname": "MSTest.Analyzers", + "version": "3.7.3", + "hash": "sha256-6mNfHtx9FBWA6/QrRUepwbxXWG/54GRyeZYazDiMacg=" + }, { "pname": "MSTest.TestAdapter", - "version": "3.6.3", - "hash": "sha256-eCN8EVtxqARpDUZdsihBJaC4UUB/jrhj5ya0HrKWbo0=" + "version": "3.7.3", + "hash": "sha256-3O/AXeS+3rHWstinivt73oa0QDp+xQpTc9p46EF+Mtc=" }, { "pname": "MSTest.TestFramework", - "version": "3.6.3", - "hash": "sha256-3nHMesxzDC5AwoLLV+It6r1PEVHWra/Gdo3qSji5cKM=" + "version": "3.7.3", + "hash": "sha256-RweCMMf14GI6HqjDIP68JM67IaJKYQTZy0jk5Q4DFxs=" }, { "pname": "Nerdbank.GitVersioning", - "version": "3.6.146", - "hash": "sha256-6lpjiwxVrwjNUhPQ6C7LzazKdBQlAbmyEQk/qxrmr8Y=" + "version": "3.7.112", + "hash": "sha256-vrItlaH5MpBHa4MI1cQgI11NAe4W3XsxR9DizFE7fus=" + }, + { + "pname": "Nerdbank.GitVersioning", + "version": "3.7.115", + "hash": "sha256-sqn+i7vvBgBUtm7j82mH+SpApgI2hsmL5DYfLm1Z7gw=" + }, + { + "pname": "Nerdbank.Streams", + "version": "2.10.69", + "hash": "sha256-a0hXKhR7dv6Vm4rlUOD2ffBKG49CC3wzXLCHeTz1ms4=" }, { "pname": "Nerdbank.Streams", @@ -614,6 +749,31 @@ "version": "1.0.2", "hash": "sha256-ZUj6YFSMZp5CZtXiamw49eZmbp1iYBuNsIKNnjxcRzA=" }, + { + "pname": "OmniSharp.Extensions.JsonRpc", + "version": "0.19.9", + "hash": "sha256-n/DjyqXDVxWIPZZ/kdNak7gTFD6638bJtvW3hrEZFWU=" + }, + { + "pname": "OmniSharp.Extensions.JsonRpc.Generators", + "version": "0.19.9", + "hash": "sha256-38+lTizxqeBkWp6ZvMOe2dVsCG1PbQXjXgerXAsK+zw=" + }, + { + "pname": "OmniSharp.Extensions.LanguageProtocol", + "version": "0.19.9", + "hash": "sha256-L1O76h4n+qYDCvnKS3j3rwHDW60S4b7s8Cgg8sBbogw=" + }, + { + "pname": "OmniSharp.Extensions.LanguageServer", + "version": "0.19.9", + "hash": "sha256-cGIRuIqUl3pKfYpeT2mY4RigbZOa2yGf1itbSFydZW0=" + }, + { + "pname": "OmniSharp.Extensions.LanguageServer.Shared", + "version": "0.19.9", + "hash": "sha256-S27e9BjRaaVcbUle+MF0nRxjHS/fIhNqDyr3aBZyiog=" + }, { "pname": "runtime.any.System.Collections", "version": "4.3.0", @@ -841,8 +1001,8 @@ }, { "pname": "StreamJsonRpc", - "version": "2.20.17", - "hash": "sha256-0uUM1JUC6NLjQOPhpEIKCt0zkd/Sh8FjMCjI2j+TYxw=" + "version": "2.20.20", + "hash": "sha256-t0DVjJejQBPk+LukHVuXSe0M2QWpDJt7W7q4DRR4OI4=" }, { "pname": "System.Buffers", @@ -896,8 +1056,8 @@ }, { "pname": "System.Configuration.ConfigurationManager", - "version": "4.4.0", - "hash": "sha256-+8wGYllXnIxRzy9dLhZFB88GoPj8ivYXS0KUfcivT8I=" + "version": "6.0.0", + "hash": "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms=" }, { "pname": "System.Configuration.ConfigurationManager", @@ -924,11 +1084,21 @@ "version": "4.3.0", "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "4.6.0", + "hash": "sha256-CXjadDqpxzYqiZzF6t3Wl6Fum+8U1/cjmEBCkzxw7h4=" + }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "5.0.0", "hash": "sha256-6mW3N6FvcdNH/pB58pl+pFSCGWgyaP4hfVtC/SMWDV4=" }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "6.0.0", + "hash": "sha256-RY9uWSPdK2fgSwlj1OHBGBVo3ZvGQgBJNzAsS5OGMWc=" + }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "6.0.1", @@ -939,6 +1109,11 @@ "version": "8.0.1", "hash": "sha256-zmwHjcJgKcbkkwepH038QhcnsWMJcHys+PEbFGC0Jgo=" }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "9.0.0", + "hash": "sha256-1VzO9i8Uq2KlTw1wnCCrEdABPZuB2JBD5gBsMTFTSvE=" + }, { "pname": "System.Diagnostics.EventLog", "version": "8.0.1", @@ -974,6 +1149,11 @@ "version": "8.0.0", "hash": "sha256-Hq3/Y2QpZlJUY52W6WYpiUSQsiMWlxvevLBF+icpGzo=" }, + { + "pname": "System.Drawing.Common", + "version": "6.0.0", + "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo=" + }, { "pname": "System.Drawing.Common", "version": "8.0.10", @@ -1006,8 +1186,8 @@ }, { "pname": "System.IO.Abstractions", - "version": "21.1.3", - "hash": "sha256-qgbg9Y5CUcll+mjJyeYp6xPED4FxwLbthr6b8Q64m4E=" + "version": "21.1.7", + "hash": "sha256-f5VSR/MlQ/uXfQvj1533qV6nrlIeaoCmSC1VHfMTOGk=" }, { "pname": "System.IO.FileSystem", @@ -1024,6 +1204,11 @@ "version": "8.0.1", "hash": "sha256-xf0BAfqQvITompBsvfpxiLts/6sRQEzdjNA3f/q/vY4=" }, + { + "pname": "System.IO.Pipelines", + "version": "7.0.0", + "hash": "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY=" + }, { "pname": "System.IO.Pipelines", "version": "8.0.0", @@ -1099,6 +1284,11 @@ "version": "4.3.2", "hash": "sha256-jB2+W3tTQ6D9XHy5sEFMAazIe1fu2jrENUO0cb48OgU=" }, + { + "pname": "System.Reactive", + "version": "6.0.0", + "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y=" + }, { "pname": "System.Reflection", "version": "4.1.0", @@ -1249,6 +1439,16 @@ "version": "4.7.0", "hash": "sha256-/9ZCPIHLdhzq7OW4UKqTsR0O93jjHd6BRG1SRwgHE1g=" }, + { + "pname": "System.Security.AccessControl", + "version": "5.0.0", + "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" + }, + { + "pname": "System.Security.AccessControl", + "version": "6.0.0", + "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg=" + }, { "pname": "System.Security.Cryptography.Pkcs", "version": "8.0.1", @@ -1256,13 +1456,13 @@ }, { "pname": "System.Security.Cryptography.ProtectedData", - "version": "4.4.0", - "hash": "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE=" + "version": "4.5.0", + "hash": "sha256-Z+X1Z2lErLL7Ynt2jFszku6/IgrngO3V1bSfZTBiFIc=" }, { "pname": "System.Security.Cryptography.ProtectedData", - "version": "4.5.0", - "hash": "sha256-Z+X1Z2lErLL7Ynt2jFszku6/IgrngO3V1bSfZTBiFIc=" + "version": "6.0.0", + "hash": "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY=" }, { "pname": "System.Security.Cryptography.ProtectedData", @@ -1274,6 +1474,11 @@ "version": "8.0.2", "hash": "sha256-9TCmVyMB4+By/ipU8vdYDtSnw1tkkebnXXVRdT78+28=" }, + { + "pname": "System.Security.Permissions", + "version": "6.0.0", + "hash": "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs=" + }, { "pname": "System.Security.Permissions", "version": "8.0.0", @@ -1374,6 +1579,11 @@ "version": "4.7.2", "hash": "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM=" }, + { + "pname": "System.Text.Json", + "version": "6.0.0", + "hash": "sha256-9AE/5ds4DqEfb0l+27fCBTSeYCdRWhxh2Bhg8IKvIuo=" + }, { "pname": "System.Text.Json", "version": "6.0.10", @@ -1419,6 +1629,11 @@ "version": "8.0.0", "hash": "sha256-8ugqZSyqfTfIBt4xcLdvb6BmBTHWFsGATkasNvsEtJQ=" }, + { + "pname": "System.Threading.Channels", + "version": "6.0.0", + "hash": "sha256-klGYnsyrjvXaGeqgfnMf/dTAMNtcHY+zM4Xh6v2JfuE=" + }, { "pname": "System.Threading.Tasks", "version": "4.0.11", @@ -1444,6 +1659,11 @@ "version": "4.10.0", "hash": "sha256-zpx/LCb2ofqdR0Z8KOqYI2xkuacv2wASKPZ06gesgog=" }, + { + "pname": "System.Windows.Extensions", + "version": "6.0.0", + "hash": "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM=" + }, { "pname": "System.Windows.Extensions", "version": "8.0.0", @@ -1461,12 +1681,12 @@ }, { "pname": "TestableIO.System.IO.Abstractions", - "version": "21.1.3", - "hash": "sha256-ZD+4JKFD6c50Kfd8AmPCO6g5jrkUFM6hGhA1W/0WvAA=" + "version": "21.1.7", + "hash": "sha256-EX5bkC9IW045vCdnl9UjjwyUtL99P8jTqkdXYEs0czI=" }, { "pname": "TestableIO.System.IO.Abstractions.Wrappers", - "version": "21.1.3", - "hash": "sha256-mS3xbH8p9rMNNpYxUb6Owb2CkDSfgnTr2XLxPKvL+6A=" + "version": "21.1.7", + "hash": "sha256-sYF7wt6vTed2B62BJzzHw+7ySyDplFD+cTJjL5MlLig=" } ] diff --git a/pkgs/by-name/bi/bicep/package.nix b/pkgs/by-name/bi/bicep/package.nix index 4a824fea8da0..2f72cd05cdcf 100644 --- a/pkgs/by-name/bi/bicep/package.nix +++ b/pkgs/by-name/bi/bicep/package.nix @@ -9,20 +9,23 @@ buildDotnetModule rec { pname = "bicep"; - version = "0.32.4"; + version = "0.33.93"; src = fetchFromGitHub { owner = "Azure"; repo = "bicep"; rev = "v${version}"; - hash = "sha256-SONzxKT+kVQTvkc4mKZcSGborXR4L9wadgss7j5PgmA="; + hash = "sha256-5XrFIgblr2WIMBPoVwRZ6X2dokbXw+nS8J7WzhHEzpU="; }; postPatch = '' substituteInPlace src/Directory.Build.props --replace-fail "true" "" ''; - projectFile = "src/Bicep.Cli/Bicep.Cli.csproj"; + projectFile = [ + "src/Bicep.Cli/Bicep.Cli.csproj" + "src/Bicep.LangServer/Bicep.LangServer.csproj" + ]; nugetDeps = ./deps.json; From 02ad387f0d6b6d6c79ec907077fe82c5543648b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 01:12:01 +0000 Subject: [PATCH 22/53] emacsPackages.ebuild-mode: 1.77 -> 1.78 --- .../elisp-packages/manual-packages/ebuild-mode/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix index 073eb3b05924..7eb5a731289f 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix @@ -6,11 +6,11 @@ melpaBuild rec { pname = "ebuild-mode"; - version = "1.77"; + version = "1.78"; src = fetchzip { url = "https://gitweb.gentoo.org/proj/ebuild-mode.git/snapshot/ebuild-mode-${version}.tar.bz2"; - hash = "sha256-nEqdM/ZQoBDeGzPH/OisCv7ErXHyEBS+J20oIublIQM="; + hash = "sha256-vpNjhW3U/b+A4O78vYKoMN0Gutd6fRcB4wb3dz1z2Cc="; }; meta = { From af3ba3e73b86e3fa39529a7e0945568931cb2212 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 01:17:53 +0000 Subject: [PATCH 23/53] hyprland-autoname-workspaces: 1.1.15 -> 1.1.16 --- pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix b/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix index 5afd37faa418..c53b6987794f 100644 --- a/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix +++ b/pkgs/by-name/hy/hyprland-autoname-workspaces/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "hyprland-autoname-workspaces"; - version = "1.1.15"; + version = "1.1.16"; src = fetchFromGitHub { owner = "hyprland-community"; repo = "hyprland-autoname-workspaces"; rev = version; - hash = "sha256-oXVKee3YAMXtVJBqJGt1SpH0KFzvIB278EN69A2OeXY="; + hash = "sha256-M/3mqO7G2E5NW2uE+X8P4UhEl0r1fPXuxyb1NowJQnY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-zkv8Eb4k3Hu4PSQKOZTEu0dNFLeoKq03uY5S7G8fo4U="; + cargoHash = "sha256-GwLyC1G2RAIvb7c8vFRAUErp1ychY9mSAWhBNzX4Kvk="; doCheck = false; From 04892acda1ad22f397965db5555dcc940fc13c99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 01:37:19 +0000 Subject: [PATCH 24/53] last: 1608 -> 1609 --- pkgs/by-name/la/last/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/last/package.nix b/pkgs/by-name/la/last/package.nix index 2729483f3343..1a9d2ea10512 100644 --- a/pkgs/by-name/la/last/package.nix +++ b/pkgs/by-name/la/last/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1608"; + version = "1609"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = "refs/tags/${version}"; - hash = "sha256-enTw68QklAJ6iz5L8y0R6ss6gAUFERfqdUMhJnPtePk="; + hash = "sha256-QSl2RvHilsD5Z65QC9Q6Flqx3gIXeoKyFOO5LWoV6MQ="; }; nativeBuildInputs = [ From 7e4b88578ead7b7ed9796f1357fa535bf2f71eac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 01:41:11 +0000 Subject: [PATCH 25/53] gitlab-release-cli: 0.21.0 -> 0.22.0 --- pkgs/by-name/gi/gitlab-release-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/gitlab-release-cli/package.nix b/pkgs/by-name/gi/gitlab-release-cli/package.nix index bb142d28b84e..f8a5b4724795 100644 --- a/pkgs/by-name/gi/gitlab-release-cli/package.nix +++ b/pkgs/by-name/gi/gitlab-release-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gitlab-release-cli"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "release-cli"; rev = "v${version}"; - hash = "sha256-jdgCRH5Jq/WZujV6es6J7AyLVtvX1oVegCeTXoV5TTM="; + hash = "sha256-LFzZLg6AaYyvB/YOe8EATHs1t0m9Y2tYzRaS2CQ7WpY="; }; vendorHash = "sha256-UwDMRsWbk8rEv2d5FssIzCLby68YZULoxd3/JGLsCQU="; From bd5db2abed4198a58f489b6dccdb274f63bfa304 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 17 Feb 2025 21:01:53 -0600 Subject: [PATCH 26/53] vimPlugins.colorful-menu-nvim: init at 2025-02-17 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 8 ++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 22 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 6ac25f36f2b1..aacd40cc52ed 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2827,6 +2827,19 @@ final: prev: meta.hydraPlatforms = [ ]; }; + colorful-menu-nvim = buildVimPlugin { + pname = "colorful-menu.nvim"; + version = "2025-02-17"; + src = fetchFromGitHub { + owner = "xzbdmw"; + repo = "colorful-menu.nvim"; + rev = "e1b4095e3726156e65d009f06ad1076b0d75dd3e"; + sha256 = "0d23l2l92n7wp0am0raap7vsjxqzgv3dc60rcwpbix138fxxas96"; + }; + meta.homepage = "https://github.com/xzbdmw/colorful-menu.nvim/"; + meta.hydraPlatforms = [ ]; + }; + colorizer = buildVimPlugin { pname = "colorizer"; version = "2022-01-03"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index f416081fa9ff..dca05fc8405e 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -739,6 +739,14 @@ in dependencies = [ self.nvim-treesitter ]; }; + colorful-menu-nvim = super.colorful-menu-nvim.overrideAttrs { + # Local bug reproduction modules + nvimSkipModule = [ + "repro_blink" + "repro_cmp" + ]; + }; + command-t = super.command-t.overrideAttrs { nativeBuildInputs = [ getconf diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index fd6589a25c2c..ca4e3f7122cc 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -216,6 +216,7 @@ https://github.com/Exafunction/codeium.vim/,HEAD, https://github.com/gorbit99/codewindow.nvim/,HEAD, https://github.com/metakirby5/codi.vim/,, https://github.com/tjdevries/colorbuddy.nvim/,, +https://github.com/xzbdmw/colorful-menu.nvim/,HEAD, https://github.com/lilydjwg/colorizer/,, https://github.com/Domeee/com.cloudedmountain.ide.neovim/,HEAD, https://github.com/wincent/command-t/,, From f1a30b68d22edbe7fbaacbb4cef312d041781600 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Tue, 18 Feb 2025 03:17:23 +0000 Subject: [PATCH 27/53] uv: 0.6.0 -> 0.6.1 --- pkgs/by-name/uv/uv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 42e65e7f2c90..5a4752c20943 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -20,17 +20,17 @@ rustPlatform.buildRustPackage rec { pname = "uv"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = version; - hash = "sha256-1D1/LY8nJI14nLghYI60a4CFmu8McUIUnxB7SeXPs1o="; + hash = "sha256-1vWg+nDh87JSs5W+8RgvAlfmNSokAU6Or41OXMcFRC8="; }; useFetchCargoVendor = true; - cargoHash = "sha256-2XLkMk6IsWho/BlPr+uxfuliAsTDat+nY0h/MJN8sXU="; + cargoHash = "sha256-Kuh3R8PRlH25wmErFVa055ggctJYFqq9fZTzyK3TAT0="; buildInputs = [ rust-jemalloc-sys From 7824ede74728100e596364012d387861fefb42a8 Mon Sep 17 00:00:00 2001 From: ZHAO Jin-Xiang Date: Tue, 18 Feb 2025 11:19:19 +0800 Subject: [PATCH 28/53] uv: update postInstall script --- pkgs/by-name/uv/uv/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 5a4752c20943..7ec417d2f190 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec { # Tests require python3 doCheck = false; - postInstall = + postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( let emulator = stdenv.hostPlatform.emulator buildPackages; in @@ -61,7 +61,8 @@ rustPlatform.buildRustPackage rec { --bash <(${emulator} $out/bin/uv generate-shell-completion bash) \ --fish <(${emulator} $out/bin/uv generate-shell-completion fish) \ --zsh <(${emulator} $out/bin/uv generate-shell-completion zsh) - ''; + '' + ); nativeInstallCheckInputs = [ versionCheckHook From e4e0b39888eafbfa7274e9661bb238e2699c5c59 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Mon, 17 Feb 2025 21:38:50 +0800 Subject: [PATCH 29/53] python313Packages.polyfactory: 2.18.1-unstable-2024-12-22 -> 2.19.0 --- pkgs/development/python-modules/polyfactory/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/polyfactory/default.nix b/pkgs/development/python-modules/polyfactory/default.nix index d3e1fb11e33d..dccb8016bd49 100644 --- a/pkgs/development/python-modules/polyfactory/default.nix +++ b/pkgs/development/python-modules/polyfactory/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "polyfactory"; - version = "2.18.1-unstable-2024-12-22"; + version = "2.19.0"; pyproject = true; src = fetchFromGitHub { owner = "litestar-org"; repo = "polyfactory"; - rev = "d6a886a4f3b33c77774e14ec190531128ce504c2"; - hash = "sha256-w13pgxVAUY/THSpwktqVgfQiGeSar9iGpzXeWv6I/vA="; + tag = "v${version}"; + hash = "sha256-0VsH2J+vEk3cF7AYvirnXPupSLE2EGrp9FF+/EOWAbw="; }; build-system = [ hatchling ]; From 0e12f014f2301e1f73125ece966250f08ed86ff4 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Mon, 17 Feb 2025 21:40:07 +0800 Subject: [PATCH 30/53] python313Packages.weaviate-client: break on darwin --- pkgs/development/python-modules/weaviate-client/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index 8cf07085e43e..b63027b8acfb 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -92,6 +92,8 @@ buildPythonPackage rec { "mock_tests" ]; + __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ "weaviate" ]; meta = { @@ -100,5 +102,9 @@ buildPythonPackage rec { changelog = "https://github.com/weaviate/weaviate-python-client/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ happysalada ]; + badPlatforms = [ + # weaviate.exceptions.WeaviateGRPCUnavailableError + lib.systems.inspect.patterns.isDarwin + ]; }; } From ba021c0fdce659d4fee8ad6e85fdeb9f878d6f0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 05:25:46 +0000 Subject: [PATCH 31/53] eww: 0.6.0-unstable-2025-01-14 -> 0.6.0-unstable-2025-02-16 --- pkgs/by-name/ew/eww/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix index 561957237ab7..ab2288fc39a7 100644 --- a/pkgs/by-name/ew/eww/package.nix +++ b/pkgs/by-name/ew/eww/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage rec { pname = "eww"; - version = "0.6.0-unstable-2025-01-14"; + version = "0.6.0-unstable-2025-02-16"; src = fetchFromGitHub { owner = "elkowar"; repo = "eww"; - rev = "593a4f4666f0bc42790d6d033e64a2b38449090f"; - hash = "sha256-DbXsiqMyZKNSFmL5aEJwJr+cPnz8qaWe5lNDoovOX/g="; + rev = "5b4cc3e7a8055afb758421f4a114ef4032806e39"; + hash = "sha256-iA/OTtsymhuCMRDC0IJE7YXuCeFJbkuMwPaj7tAVbQw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-JBX6jyqzkbqnpA/P2BJ04UHTU6lWbMUcD2uMUJPblvc="; + cargoHash = "sha256-tjhF4D5WFw6qBUXRWcWjaB57zyXeWBDULsOcr2MJJgA="; nativeBuildInputs = [ installShellFiles From 72d8ee1470e7b9e7e405bf3f464a6da051f2a11a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 05:39:59 +0000 Subject: [PATCH 32/53] novelwriter: 2.6.1 -> 2.6.3 --- pkgs/by-name/no/novelwriter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/novelwriter/package.nix b/pkgs/by-name/no/novelwriter/package.nix index 5cac7a547273..96db76a40206 100644 --- a/pkgs/by-name/no/novelwriter/package.nix +++ b/pkgs/by-name/no/novelwriter/package.nix @@ -7,7 +7,7 @@ nix-update-script, }: let - version = "2.6.1"; + version = "2.6.3"; in python3.pkgs.buildPythonApplication { pname = "novelwriter"; @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication { owner = "vkbo"; repo = "novelWriter"; rev = "v${version}"; - hash = "sha256-z2iDRTWiqdjEpqCn4pNthNFl/zGGoVLU/XsRJaQ3Ys4="; + hash = "sha256-262YMVqxSZv8G82amdRnHiW/5gnxkYyFSQDiS5gOdBE="; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; From d56454fe0b9a25fee5fd092a152bc0fed889bfa7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 06:13:39 +0000 Subject: [PATCH 33/53] walker: 0.12.13 -> 0.12.15 --- pkgs/by-name/wa/walker/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/walker/package.nix b/pkgs/by-name/wa/walker/package.nix index fbf3380cb1a1..6bca4128b104 100644 --- a/pkgs/by-name/wa/walker/package.nix +++ b/pkgs/by-name/wa/walker/package.nix @@ -13,13 +13,13 @@ buildGoModule rec { pname = "walker"; - version = "0.12.13"; + version = "0.12.15"; src = fetchFromGitHub { owner = "abenz1267"; repo = "walker"; rev = "v${version}"; - hash = "sha256-B5ZFcPLgp5a3CJGlWDmuT+rfwIA/X75HUYISP44aykc="; + hash = "sha256-V3F/WgmHE3xEQhbwdeB1ENUuvESJUJpwdULfIz/hsD8="; }; vendorHash = "sha256-6PPNVnsH1eU4fLcZpxiBoHCzN/TUUxfTfmxDsBDPDKQ="; From 19fc3e56ed8b8d77cfc78c34575fe44c65fbaaa3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 06:57:40 +0000 Subject: [PATCH 34/53] spicetify-cli: 2.38.9 -> 2.39.3 --- pkgs/by-name/sp/spicetify-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sp/spicetify-cli/package.nix b/pkgs/by-name/sp/spicetify-cli/package.nix index 5ed8bc124253..83f1b68c4cdc 100644 --- a/pkgs/by-name/sp/spicetify-cli/package.nix +++ b/pkgs/by-name/sp/spicetify-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.38.9"; + version = "2.39.3"; src = fetchFromGitHub { owner = "spicetify"; repo = "cli"; rev = "v${version}"; - hash = "sha256-aNDZZzSqVBom499mx6OZlZbeS6UvWJCKs3003TpWITo="; + hash = "sha256-w4wrXgrsUNO3dUfzgx1Xua2heyrfxLFXB1hGwOcNAEs="; }; - vendorHash = "sha256-a6lAVBUoSTqHnAKKvW+egmtupsuy0uB/XGtBaljju1I="; + vendorHash = "sha256-3U/qV81UXS/Xh3K6OnMUyRKeMSBQUHLP64EOQl6TfMY="; ldflags = [ "-s -w" From 21fe7f239cddf0ec87a616aa8dfd669514790650 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Tue, 18 Feb 2025 18:03:32 +1100 Subject: [PATCH 35/53] python312Packages.mayavi: mark as broken on darwin --- pkgs/development/python-modules/mayavi/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix index 540b401fcbe6..046ef18f3628 100644 --- a/pkgs/development/python-modules/mayavi/default.nix +++ b/pkgs/development/python-modules/mayavi/default.nix @@ -11,6 +11,7 @@ pyqt5, pythonOlder, pythonAtLeast, + stdenv, traitsui, vtk, wrapQtAppsHook, @@ -59,5 +60,8 @@ buildPythonPackage rec { license = licenses.bsdOriginal; maintainers = with maintainers; [ ]; mainProgram = "mayavi2"; + # Fails during stripping with: + # The file was not recognized as a valid object file + broken = stdenv.hostPlatform.isDarwin; }; } From a7b402270dc3ac0f3170405c710d971d7535a5df Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 3 Feb 2025 22:58:05 +0100 Subject: [PATCH 36/53] libjaylink: Sort package inputs alphabetically Signed-off-by: Felix Singer --- pkgs/by-name/li/libjaylink/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libjaylink/package.nix b/pkgs/by-name/li/libjaylink/package.nix index 594726f6efe1..9c059f067e9c 100644 --- a/pkgs/by-name/li/libjaylink/package.nix +++ b/pkgs/by-name/li/libjaylink/package.nix @@ -1,10 +1,10 @@ { + autoreconfHook, fetchFromGitLab, lib, - stdenv, - autoreconfHook, - pkg-config, libusb1, + pkg-config, + stdenv, }: stdenv.mkDerivation rec { From d30e3755f3aeedb1ad006f73a9387522ab12bd4a Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 3 Feb 2025 23:01:52 +0100 Subject: [PATCH 37/53] libjaylink: Use tag parameter instead of rev Version tags are used. So switch to the tag parameter. Signed-off-by: Felix Singer --- pkgs/by-name/li/libjaylink/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libjaylink/package.nix b/pkgs/by-name/li/libjaylink/package.nix index 9c059f067e9c..59f821dff7dd 100644 --- a/pkgs/by-name/li/libjaylink/package.nix +++ b/pkgs/by-name/li/libjaylink/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { domain = "gitlab.zapb.de"; owner = "libjaylink"; repo = "libjaylink"; - rev = version; + tag = version; hash = "sha256-odJDE1A0WZ9vBXPxaUdthjTgmbmbdHjbyY1PkaM4+vI="; }; From d364584d4a5898dbf548bfa1c735d9b6fc7803a4 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 3 Feb 2025 23:03:52 +0100 Subject: [PATCH 38/53] libjaylink: Enable nix-update-script Signed-off-by: Felix Singer --- pkgs/by-name/li/libjaylink/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/li/libjaylink/package.nix b/pkgs/by-name/li/libjaylink/package.nix index 59f821dff7dd..7445e4e02e64 100644 --- a/pkgs/by-name/li/libjaylink/package.nix +++ b/pkgs/by-name/li/libjaylink/package.nix @@ -3,6 +3,7 @@ fetchFromGitLab, lib, libusb1, + nix-update-script, pkg-config, stdenv, }: @@ -33,6 +34,8 @@ stdenv.mkDerivation rec { install -Dm644 contrib/99-libjaylink.rules $out/lib/udev/rules.d/libjaylink.rules ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { homepage = "https://gitlab.zapb.de/libjaylink/libjaylink"; description = "libjaylink is a shared library written in C to access SEGGER J-Link and compatible devices"; From df472f9cfe2b24b84f167db985661e8df7b4f85f Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Mon, 3 Feb 2025 23:06:52 +0100 Subject: [PATCH 39/53] libjaylink: 0.3.1 -> 0.4 In addition to updating the package, restore the udev role ordering and use 60 as priority which is used by the libjaylink project. The ordering is needed in order to make the uaccess tag working since it needs to be applied before 73-seat-late.rule. uaccess does not conflict with mode/group configuration. Signed-off-by: Felix Singer --- pkgs/by-name/li/libjaylink/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libjaylink/package.nix b/pkgs/by-name/li/libjaylink/package.nix index 7445e4e02e64..0ca4aa2c01ea 100644 --- a/pkgs/by-name/li/libjaylink/package.nix +++ b/pkgs/by-name/li/libjaylink/package.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "libjaylink"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitLab { domain = "gitlab.zapb.de"; owner = "libjaylink"; repo = "libjaylink"; tag = version; - hash = "sha256-odJDE1A0WZ9vBXPxaUdthjTgmbmbdHjbyY1PkaM4+vI="; + hash = "sha256-PghPVgovNo/HhNg7c6EGXrqi6jMrb8p/uLqGDIZ7t+s="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - install -Dm644 contrib/99-libjaylink.rules $out/lib/udev/rules.d/libjaylink.rules + install -Dm644 contrib/60-libjaylink.rules $out/lib/udev/rules.d/60-libjaylink.rules ''; passthru.updateScript = nix-update-script { }; From f062cf97bef63604f88489613368f4f0ad860062 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 07:40:36 +0000 Subject: [PATCH 40/53] lazyjournal: 0.7.1 -> 0.7.3 --- pkgs/by-name/la/lazyjournal/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/lazyjournal/package.nix b/pkgs/by-name/la/lazyjournal/package.nix index 47222cc75b38..2b36b92e32f1 100644 --- a/pkgs/by-name/la/lazyjournal/package.nix +++ b/pkgs/by-name/la/lazyjournal/package.nix @@ -5,7 +5,7 @@ nix-update-script, }: let - version = "0.7.1"; + version = "0.7.3"; in buildGoModule { pname = "lazyjournal"; @@ -15,7 +15,7 @@ buildGoModule { owner = "Lifailon"; repo = "lazyjournal"; tag = version; - hash = "sha256-FFPwifOLikuU7OEDglNFpBtME+3lWjzYMpE8uKz5umQ="; + hash = "sha256-uu36MmBT2K7ToeWcOxR/7ZvEVw+a3nj/zeA1ZbLTbYE="; }; vendorHash = "sha256-1tQ0ZFww9VCnoRzmOQw9RaiRJmTRErAio13uAAKtgTw="; From 47b0560069b5c6b5f1d3db4d92a8eb50ec10a228 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 08:00:21 +0000 Subject: [PATCH 41/53] polarity: latest-unstable-2025-02-03 -> latest-unstable-2025-02-13 --- pkgs/by-name/po/polarity/Cargo.lock | 776 +++++++++++++++++++++------ pkgs/by-name/po/polarity/package.nix | 6 +- 2 files changed, 629 insertions(+), 153 deletions(-) diff --git a/pkgs/by-name/po/polarity/Cargo.lock b/pkgs/by-name/po/polarity/Cargo.lock index a4421f51c64a..7b8ef2bab1a9 100644 --- a/pkgs/by-name/po/polarity/Cargo.lock +++ b/pkgs/by-name/po/polarity/Cargo.lock @@ -23,7 +23,7 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ - "getrandom", + "getrandom 0.2.15", "once_cell", "version_check", ] @@ -37,6 +37,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + [[package]] name = "anstream" version = "0.6.18" @@ -78,11 +84,12 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "3.0.6" +version = "3.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" +checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" dependencies = [ "anstyle", + "once_cell", "windows-sys 0.59.0", ] @@ -133,7 +140,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -283,7 +290,7 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 5.3.1", + "event-listener 5.4.0", "event-listener-strategy", "pin-project-lite", ] @@ -322,13 +329,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.84" +version = "0.1.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1244b10dcd56c92219da4e14caa97e312079e185f04ba3eea25061561dc0a0" +checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -339,13 +346,13 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "auto_impl" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" +checksum = "e12882f59de5360c748c4cbf569a042d5fb0eb515f7bea9c1f470b47f6ffbd73" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -416,6 +423,15 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + [[package]] name = "bit-set" version = "0.5.3" @@ -439,9 +455,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" [[package]] name = "bitpacking" @@ -465,6 +481,31 @@ dependencies = [ "piper", ] +[[package]] +name = "bon" +version = "3.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe7acc34ff59877422326db7d6f2d845a582b16396b6b08194942bf34c6528ab" +dependencies = [ + "bon-macros", + "rustversion", +] + +[[package]] +name = "bon-macros" +version = "3.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4159dd617a7fbc9be6a692fe69dc2954f8e6bb6bb5e4d7578467441390d77fd0" +dependencies = [ + "darling", + "ident_case", + "prettyplease", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.98", +] + [[package]] name = "bstr" version = "1.11.3" @@ -478,9 +519,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[package]] name = "byteorder" @@ -490,15 +531,30 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" +checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9" + +[[package]] +name = "caseless" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6fd507454086c8edfd769ca6ada439193cdb209c7681712ef6275cccbfe5d8" +dependencies = [ + "unicode-normalization", +] + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.2.7" +version = "1.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7" +checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda" dependencies = [ "shlex", ] @@ -516,10 +572,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "clap" -version = "4.5.23" +name = "ciborium" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "clap" +version = "4.5.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8acebd8ad879283633b343856142139f2da2317c96b05b4dd6181c61e2480184" dependencies = [ "clap_builder", "clap_derive", @@ -527,35 +610,36 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.23" +version = "4.5.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" +checksum = "f6ba32cbda51c7e1dfd49acc1457ba1a7dec5b64fe360e828acb13ca8dc9c2f9" dependencies = [ "anstream", "anstyle", "clap_lex", "strsim", + "terminal_size", ] [[package]] name = "clap_complete" -version = "4.5.40" +version = "4.5.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac2e663e3e3bed2d32d065a8404024dad306e699a04263ec59919529f803aee9" +checksum = "375f9d8255adeeedd51053574fd8d4ba875ea5fa558e86617b07f09f1680c8b6" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.5.18" +version = "4.5.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -579,6 +663,27 @@ dependencies = [ "memchr", ] +[[package]] +name = "comrak" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48ae8f3e7e3f3d424cbb33354fc36943d507327d210aa5794b0192f4be726c6d" +dependencies = [ + "bon", + "caseless", + "clap", + "entities", + "memchr", + "once_cell", + "regex", + "shell-words", + "slug", + "syntect", + "typed-arena", + "unicode_categories", + "xdg", +] + [[package]] name = "concurrent-queue" version = "2.5.0" @@ -598,6 +703,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "console_log" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be8aed40e4edbf4d3b4431ab260b63fdc40f5780a4766824329ea0f1eefe3c0f" +dependencies = [ + "log", + "web-sys", +] + [[package]] name = "core-foundation" version = "0.9.4" @@ -623,6 +738,42 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "is-terminal", + "itertools 0.10.5", + "num-traits", + "once_cell", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools 0.10.5", +] + [[package]] name = "crossbeam-channel" version = "0.5.14" @@ -659,9 +810,44 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" + +[[package]] +name = "darling" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.98", +] + +[[package]] +name = "darling_macro" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.98", +] [[package]] name = "dashmap" @@ -698,6 +884,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "deunicode" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00" + [[package]] name = "diff" version = "0.1.13" @@ -739,7 +931,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -755,6 +947,7 @@ dependencies = [ "askama", "askama_escape", "ast", + "comrak", "driver", "opener", "printer", @@ -827,6 +1020,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "entities" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca" + [[package]] name = "env_filter" version = "0.1.3" @@ -874,9 +1073,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "5.3.1" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" dependencies = [ "concurrent-queue", "parking", @@ -889,7 +1088,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2" dependencies = [ - "event-listener 5.3.1", + "event-listener 5.4.0", "pin-project-lite", ] @@ -904,6 +1103,16 @@ dependencies = [ "rand", ] +[[package]] +name = "fancy-regex" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" +dependencies = [ + "bit-set", + "regex", +] + [[package]] name = "fastdivide" version = "0.4.2" @@ -932,6 +1141,16 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" +[[package]] +name = "flate2" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + [[package]] name = "fluent-uri" version = "0.1.4" @@ -1031,9 +1250,9 @@ checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1" +checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532" dependencies = [ "fastrand", "futures-core", @@ -1050,7 +1269,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -1100,7 +1319,19 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.13.3+wasi-0.2.2", + "windows-targets", ] [[package]] @@ -1140,6 +1371,16 @@ dependencies = [ "tracing", ] +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -1221,9 +1462,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.5" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" +checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a" [[package]] name = "humansize" @@ -1242,9 +1483,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "1.5.2" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0" +checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" dependencies = [ "bytes", "futures-channel", @@ -1427,9 +1668,15 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "1.0.3" @@ -1453,9 +1700,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.7.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" +checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" dependencies = [ "equivalent", "hashbrown 0.15.2", @@ -1475,19 +1722,19 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" [[package]] name = "is-terminal" -version = "0.4.13" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +checksum = "e19b23d53f35ce9f56aebc7d1bb4e6ac1e9c0db7ac85c8d1760c04379edced37" dependencies = [ "hermit-abi 0.4.0", "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1528,9 +1775,9 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "js-sys" -version = "0.3.76" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ "once_cell", "wasm-bindgen", @@ -1637,15 +1884,21 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "libc", ] [[package]] -name = "linux-raw-sys" -version = "0.4.14" +name = "linked-hash-map" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" [[package]] name = "litemap" @@ -1665,9 +1918,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" dependencies = [ "value-bag", ] @@ -1693,7 +1946,7 @@ dependencies = [ "proc-macro2", "quote", "regex-syntax 0.8.5", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -1735,9 +1988,11 @@ version = "0.0.0" dependencies = [ "async-trait", "console_error_panic_hook", + "console_log", "driver", "futures", "js-sys", + "log", "lsp-server", "reqwest", "tower-lsp", @@ -1807,9 +2062,9 @@ dependencies = [ [[package]] name = "miette" -version = "7.4.0" +version = "7.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317f146e2eb7021892722af37cf1b971f0a70c8406f487e24952667616192c64" +checksum = "1a955165f87b37fd1862df2a59547ac542c77ef6d17c666f619d1ad22dd89484" dependencies = [ "backtrace", "backtrace-ext", @@ -1827,13 +2082,13 @@ dependencies = [ [[package]] name = "miette-derive" -version = "7.4.0" +version = "7.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c9b935fbe1d6cbd1dac857b54a688145e2d93f48db36010514d0f612d0ad67" +checksum = "bf45bf44ab49be92fd1227a3be6fc6f617f1a337c06af54981048574d8783147" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -1867,9 +2122,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394" +checksum = "b3b1c9bd4fe1f0f8b387f6eb9eb3b4a1aa26185e5750efb9140301703f62cd1b" dependencies = [ "adler2", ] @@ -1881,7 +2136,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", ] @@ -1896,9 +2151,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +checksum = "0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c" dependencies = [ "libc", "log", @@ -1982,15 +2237,43 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.2" +version = "1.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" [[package]] name = "oneshot" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e296cf87e61c9cfc1a61c3c63a0f7f286ed4554e0e22be84e8a38e1d264a2a29" +checksum = "79d72a7c0f743d2ebb0a2ad1d219db75fdc799092ed3a884c9144c42a31225bd" + +[[package]] +name = "onig" +version = "6.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f" +dependencies = [ + "bitflags 1.3.2", + "libc", + "once_cell", + "onig_sys", +] + +[[package]] +name = "onig_sys" +version = "69.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] +name = "oorandom" +version = "11.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "opener" @@ -2008,7 +2291,7 @@ version = "0.10.70" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61cfb4e166a8bb8c9b55c500bc2308550148ece889be90f609377e58140f42c6" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "cfg-if", "foreign-types", "libc", @@ -2025,14 +2308,14 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] name = "openssl-probe" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-sys" @@ -2124,9 +2407,9 @@ dependencies = [ [[package]] name = "phf_shared" -version = "0.10.0" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" dependencies = [ "siphasher", ] @@ -2139,9 +2422,9 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pin-project-lite" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -2166,6 +2449,47 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" +[[package]] +name = "plist" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" +dependencies = [ + "base64 0.22.1", + "indexmap", + "quick-xml", + "serde", + "time", +] + +[[package]] +name = "plotters" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" + +[[package]] +name = "plotters-svg" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" +dependencies = [ + "plotters-backend", +] + [[package]] name = "polarity" version = "0.1.0" @@ -2190,6 +2514,24 @@ dependencies = [ "tower-lsp", ] +[[package]] +name = "polarity-bench" +version = "0.1.0" +dependencies = [ + "ast", + "async-std", + "criterion", + "docs", + "driver", + "elaborator", + "futures", + "lsp-server", + "miette", + "printer", + "tokio", + "url", +] + [[package]] name = "polling" version = "3.7.4" @@ -2276,6 +2618,16 @@ dependencies = [ "yansi", ] +[[package]] +name = "prettyplease" +version = "0.2.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6924ced06e1f7dfe3fa48d57b9f74f55d8915f5036121bef647ef4b204895fac" +dependencies = [ + "proc-macro2", + "syn 2.0.98", +] + [[package]] name = "printer" version = "0.1.0" @@ -2286,13 +2638,22 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" dependencies = [ "unicode-ident", ] +[[package]] +name = "quick-xml" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2" +dependencies = [ + "memchr", +] + [[package]] name = "quote" version = "1.0.38" @@ -2329,7 +2690,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom", + "getrandom 0.2.15", ] [[package]] @@ -2358,7 +2719,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", ] [[package]] @@ -2367,7 +2728,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ - "getrandom", + "getrandom 0.2.15", "libredox", "thiserror", ] @@ -2465,7 +2826,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", "cfg-if", - "getrandom", + "getrandom 0.2.15", "libc", "spin", "untrusted", @@ -2509,11 +2870,11 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustix" -version = "0.38.42" +version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "errno", "libc", "linux-raw-sys", @@ -2522,9 +2883,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.20" +version = "0.23.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b" +checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395" dependencies = [ "once_cell", "rustls-pki-types", @@ -2544,9 +2905,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" +checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" [[package]] name = "rustls-webpki" @@ -2567,9 +2928,9 @@ checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" [[package]] name = "ryu" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd" [[package]] name = "same-file" @@ -2601,7 +2962,7 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "core-foundation", "core-foundation-sys", "libc", @@ -2610,9 +2971,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.13.0" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1863fd3768cd83c56a7f60faa4dc0d403f1b6df0a38c3c25f44b7894e45370d5" +checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" dependencies = [ "core-foundation-sys", "libc", @@ -2635,14 +2996,14 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] name = "serde_json" -version = "1.0.134" +version = "1.0.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" dependencies = [ "itoa", "memchr", @@ -2658,7 +3019,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -2673,6 +3034,12 @@ dependencies = [ "serde", ] +[[package]] +name = "shell-words" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" + [[package]] name = "shlex" version = "1.3.0" @@ -2681,9 +3048,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "siphasher" -version = "0.3.11" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] name = "slab" @@ -2694,6 +3061,16 @@ dependencies = [ "autocfg", ] +[[package]] +name = "slug" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "882a80f72ee45de3cc9a5afeb2da0331d58df69e4e7d8eeb5d3c7784ae67e724" +dependencies = [ + "deunicode", + "wasm-bindgen", +] + [[package]] name = "smallvec" version = "1.13.2" @@ -2730,12 +3107,11 @@ checksum = "d08889ec5408683408db66ad89e0e1f93dff55c73a4ccc71c427d5b277ee47e6" [[package]] name = "string_cache" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +checksum = "938d512196766101d333398efde81bc1f37b00cb42c2f8350e5df639f040bbbe" dependencies = [ "new_debug_unreachable", - "once_cell", "parking_lot", "phf_shared", "precomputed-hash", @@ -2787,9 +3163,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.95" +version = "2.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a" +checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1" dependencies = [ "proc-macro2", "quote", @@ -2813,7 +3189,30 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", +] + +[[package]] +name = "syntect" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "874dcfa363995604333cf947ae9f751ca3af4522c60886774c4963943b4746b1" +dependencies = [ + "bincode", + "bitflags 1.3.2", + "fancy-regex", + "flate2", + "fnv", + "once_cell", + "onig", + "plist", + "regex-syntax 0.8.5", + "serde", + "serde_derive", + "serde_json", + "thiserror", + "walkdir", + "yaml-rust", ] [[package]] @@ -2822,7 +3221,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "core-foundation", "system-configuration-sys", ] @@ -2928,13 +3327,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.15.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" +checksum = "38c246215d7d24f48ae091a2902398798e05d978b24315d6efbc00ede9a8bb91" dependencies = [ "cfg-if", "fastrand", - "getrandom", + "getrandom 0.3.1", "once_cell", "rustix", "windows-sys 0.59.0", @@ -3036,7 +3435,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -3090,10 +3489,35 @@ dependencies = [ ] [[package]] -name = "tokio" -version = "1.42.0" +name = "tinytemplate" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "tinyvec" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8" +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.43.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", @@ -3195,7 +3619,7 @@ source = "git+https://github.com/tower-lsp/tower-lsp?rev=19f5a87810ff4b643d2bc39 dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -3223,7 +3647,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -3267,9 +3691,9 @@ checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" [[package]] name = "unicode-ident" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" +checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034" [[package]] name = "unicode-linebreak" @@ -3277,6 +3701,15 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" +[[package]] +name = "unicode-normalization" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +dependencies = [ + "tinyvec", +] + [[package]] name = "unicode-segmentation" version = "1.12.0" @@ -3295,6 +3728,12 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + [[package]] name = "untrusted" version = "0.9.0" @@ -3338,11 +3777,11 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.11.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" +checksum = "ced87ca4be083373936a67f8de945faa23b6b42384bd5b64434850802c6dccd0" dependencies = [ - "getrandom", + "getrandom 0.3.1", "serde", ] @@ -3366,9 +3805,9 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "wait-timeout" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11" dependencies = [ "libc", ] @@ -3399,35 +3838,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasm-bindgen" -version = "0.2.99" +name = "wasi" +version = "0.13.3+wasi-0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" +checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2" +dependencies = [ + "wit-bindgen-rt", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.49" +version = "0.4.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" +checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" dependencies = [ "cfg-if", "futures-core", @@ -3439,9 +3888,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3449,22 +3898,25 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "wasm-streams" @@ -3481,9 +3933,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.76" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" dependencies = [ "js-sys", "wasm-bindgen", @@ -3632,6 +4084,15 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "wit-bindgen-rt" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c" +dependencies = [ + "bitflags 2.8.0", +] + [[package]] name = "write16" version = "1.0.0" @@ -3644,6 +4105,21 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" +[[package]] +name = "xdg" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" + +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + [[package]] name = "yansi" version = "1.0.1" @@ -3670,7 +4146,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", "synstructure", ] @@ -3692,7 +4168,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] [[package]] @@ -3712,7 +4188,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", "synstructure", ] @@ -3741,5 +4217,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.95", + "syn 2.0.98", ] diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix index af92867df5f1..cf37b720de30 100644 --- a/pkgs/by-name/po/polarity/package.nix +++ b/pkgs/by-name/po/polarity/package.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "polarity"; - version = "latest-unstable-2025-02-03"; + version = "latest-unstable-2025-02-13"; src = fetchFromGitHub { owner = "polarity-lang"; repo = "polarity"; - rev = "701d7d9c2c1f72477ce661a7656ec26c823d8a0b"; - hash = "sha256-0fuM4p5fDthFP56pExviiZtU78mLV0oWzcVyS6+Euy0="; + rev = "48d38742310d320fcf02e585db711ac4f80af742"; + hash = "sha256-GFMgathIgEG7/4Vo+JWczvUpK7RBzyrnPKj12OW80Mc="; }; cargoLock = { From 61b1a1af71cb6a7002c8a69f1ca551925789f1f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Feb 2025 08:09:39 +0000 Subject: [PATCH 42/53] tinty: 0.26.0 -> 0.26.1 --- pkgs/by-name/ti/tinty/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ti/tinty/package.nix b/pkgs/by-name/ti/tinty/package.nix index 0f9a6892160c..01932c021c38 100644 --- a/pkgs/by-name/ti/tinty/package.nix +++ b/pkgs/by-name/ti/tinty/package.nix @@ -6,7 +6,7 @@ nix-update-script, }: let - version = "0.26.0"; + version = "0.26.1"; in rustPlatform.buildRustPackage { pname = "tinty"; @@ -16,11 +16,11 @@ rustPlatform.buildRustPackage { owner = "tinted-theming"; repo = "tinty"; tag = "v${version}"; - hash = "sha256-tQW8z0Gtxh0cnMwm9oN3PyOQW7YFVXG2LDkljudMDp0="; + hash = "sha256-+HTdmAKsm9YXyLktAfjPenbRi1RrrCusc6+ZarCI7Ac="; }; useFetchCargoVendor = true; - cargoHash = "sha256-2S2M5AoppPoHIgEGGsCxrztTGXVAZIBax4VRQMH+5CE="; + cargoHash = "sha256-7erxE5sfEMsZiOh/VPfQYsowUub9nefkNaGYjNr0Pyg="; # Pretty much all tests require internet access doCheck = false; From 5f7051446bce5900323376d3b21c9a0063cba898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C6=B0=C6=A1ng=20Huy=20Trung?= Date: Fri, 14 Jun 2024 00:56:55 +0930 Subject: [PATCH 43/53] mobsql: init at 0.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Nguyễn Gia Phong --- pkgs/by-name/mo/mobsql/package.nix | 51 ++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 pkgs/by-name/mo/mobsql/package.nix diff --git a/pkgs/by-name/mo/mobsql/package.nix b/pkgs/by-name/mo/mobsql/package.nix new file mode 100644 index 000000000000..9332d56db5a2 --- /dev/null +++ b/pkgs/by-name/mo/mobsql/package.nix @@ -0,0 +1,51 @@ +{ + lib, + buildGoModule, + fetchFromSourcehut, + sqlite, +}: + +buildGoModule rec { + pname = "mobsql"; + version = "0.9.0"; + + src = fetchFromSourcehut { + owner = "~mil"; + repo = "mobsql"; + rev = "v${version}"; + hash = "sha256-7zrM2vmaikyClNgHHO8OXmATNpJtH85/CDv/86vwzZU="; + }; + vendorHash = "sha256-YqduGY9c4zRQscjqze3ZOAB8EYj+0/6V7NceRwLe3DY="; + + buildInputs = [ sqlite ]; + + buildPhase = '' + runHook preBuild + go build -o $GOPATH/bin/mobsql\ + -tags=sqlite_math_functions,libsqlite3 cli/*.go + runHook postBuild + ''; + + checkPhase = '' + runHook preCheck + HOME=$TMPDIR go test -tags=sqlite_math_functions,libsqlite3 ./... + runHook postCheck + ''; + + meta = with lib; { + description = "GTFS to SQLite import utility"; + longDescription = '' + Mobsql is a Go library and command-line application + which facilitates loading one or multiple Mobility Database + source GTFS feed archives into a SQLite database. + Its internal SQLite schema mirrors GTFS's spec but adds a feed_id field + to each table (thus allowing multiple feeds to be loaded + to the database simulatenously). + ''; + homepage = "https://git.sr.ht/~mil/mobsql"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.McSinyx ]; + mainProgram = "mobsql"; + platforms = platforms.unix; + }; +} From a36b794f00fc99e00140aad6c4fb284bf05b1bb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C6=B0=C6=A1ng=20Huy=20Trung?= Date: Fri, 14 Jun 2024 00:56:41 +0930 Subject: [PATCH 44/53] mobroute: init at 0.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Nguyễn Gia Phong Co-Authored-By: Nikolay Korotkiy --- pkgs/by-name/mo/mobroute/package.nix | 57 ++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 pkgs/by-name/mo/mobroute/package.nix diff --git a/pkgs/by-name/mo/mobroute/package.nix b/pkgs/by-name/mo/mobroute/package.nix new file mode 100644 index 000000000000..6f1006ca9fdb --- /dev/null +++ b/pkgs/by-name/mo/mobroute/package.nix @@ -0,0 +1,57 @@ +{ + lib, + buildGoModule, + fetchFromSourcehut, + sqlite, + stdenv, +}: + +buildGoModule rec { + pname = "mobroute"; + version = "0.9.0"; + + src = fetchFromSourcehut { + owner = "~mil"; + repo = "mobroute"; + rev = "v${version}"; + hash = "sha256-eMLn9Px6jO88CQWpwFF7JK1UPHoEbhDXoU2G1aYe2dw="; + }; + vendorHash = "sha256-fMIa9HCfK6YDb0V0RhzomwuSqPhlwLBHJRjQV96cY8g="; + + buildInputs = [ sqlite ]; + tags = [ + "libsqlite3" + "sqlite_math_functions" + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + postInstall = '' + mv $out/bin/{cli,mobroute} + ''; + + meta = with lib; { + description = "General purpose public transportation router based on GTFS"; + longDescription = '' + Mobroute is a general purpose public transportation router + (e.g. trip planner) Go library and CLI that works + by directly ingesting timetable (GTFS) data from transit agencies + (sourced from the Mobility Database). After data has been fetched, + routing calculations can be run offline. + + Overall, Mobroute aims to offer an opensource framework + for integrating data-provider-agnostic GTFS public transit capabilities + (integrated GTFS ETL, GTFS multisource support, and routing algorithm) + into applications to get users from point-a to point-b via public transit + without comprising privacy or user freedoms. + ''; + homepage = "https://git.sr.ht/~mil/mobroute"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.McSinyx ]; + mainProgram = "mobroute"; + platforms = platforms.unix; + broken = stdenv.hostPlatform.isDarwin; + }; +} From 9f7331a682f119bb81089d8412afc044ad2b76a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C6=B0=C6=A1ng=20Huy=20Trung?= Date: Fri, 14 Jun 2024 00:57:08 +0930 Subject: [PATCH 45/53] transito: init at 0.9.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Nguyễn Gia Phong --- pkgs/by-name/tr/transito/package.nix | 74 ++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 pkgs/by-name/tr/transito/package.nix diff --git a/pkgs/by-name/tr/transito/package.nix b/pkgs/by-name/tr/transito/package.nix new file mode 100644 index 000000000000..a87a00f33753 --- /dev/null +++ b/pkgs/by-name/tr/transito/package.nix @@ -0,0 +1,74 @@ +{ + lib, + buildGoModule, + fetchFromSourcehut, + pkg-config, + vulkan-headers, + libxkbcommon, + wayland, + xorg, + libGL, + sqlite, +}: + +buildGoModule rec { + pname = "transito"; + version = "0.9.1"; + + src = fetchFromSourcehut { + owner = "~mil"; + repo = "transito"; + rev = "v${version}"; + hash = "sha256-5aG/hmpUAN2qYxpqMKLl2WnYgR/sPdtAwLGkFXVyrNs="; + }; + vendorHash = "sha256-7QMO+/f+yc5GfxvDLIXuf+QT2cAmbgI6iQqWmQIkMMA="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + vulkan-headers + libxkbcommon + wayland + xorg.libX11 + xorg.libXcursor + xorg.libXfixes + libGL + sqlite + ]; + + tags = [ "sqlite_math_functions" ]; + ldflags = [ "-X git.sr.ht/~mil/transito/src/uipages/pageconfig.Commit=${version}" ]; + + postInstall = '' + install -Dm644 -t $out/share/applications assets/transito.desktop + install -Dm644 -t $out/share/pixmaps assets/transito.png + for icon in assets/transito_*.png + do + name=$(basename $icon .png) + install -Dm644 -t $out/share/icons/hicolor/''${name#transito_}/apps $icon + done + ''; + + doCheck = false; # no test + + meta = with lib; { + description = "Data-provider-agnostic (GTFS) public transportation app"; + longDescription = '' + Transito is a data-provider-agnostic public transportation app + that let's you route between locations using openly available + public GTFS feeds. Utilizing the Mobroute library, + the Transito app lets you performs routing calculations offline + (no network calls once data is initially fetched). + + Overall, Transito aims to be an opensource alternative + to proprietary routing apps to get users from point A to point B + via public transit without comprising privacy or user freedoms. + It works in many well-connected metros which have publicly available + GTFS data, to name a few: Lisbon, NYC, Brussels, Krakow, and Bourges. + ''; + homepage = "https://git.sr.ht/~mil/transito"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.McSinyx ]; + mainProgram = "transito"; + platforms = platforms.unix; + }; +} From bdc95d5afb40a5e0e21a656dadc9a07973bc31b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Fri, 9 Aug 2024 13:25:31 +0900 Subject: [PATCH 46/53] mepo: 1.2.1 -> 1.3.3 --- .../manual/release-notes/rl-2505.section.md | 6 +++++ pkgs/by-name/me/mepo/package.nix | 24 +++++++++---------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 994a4e95b4ab..5ab69087a925 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -230,6 +230,12 @@ - `zammad` has had its support for MySQL removed, since it was never working correctly and is now deprecated upstream. Check the [migration guide](https://docs.zammad.org/en/latest/appendix/migrate-to-postgresql.html) for how to convert your database to PostgreSQL. +- `mepo` was updated to version 1.3.3. The manual page was removed, + a new JSON API was introduced to replace Mepolang for configuration, + and a few default key bindings were changed. + See the [1.3.0 changelog](https://git.sr.ht/~mil/mepo/refs/1.3.0) + for more details. + - The `earlyoom` service is now using upstream systemd service, which enables hardening and filesystem isolation by default. If you need filesystem write access or want to access home directory via `killHook`, hardening setting can diff --git a/pkgs/by-name/me/mepo/package.nix b/pkgs/by-name/me/mepo/package.nix index 06f6b22d4ea4..12601684e2bb 100644 --- a/pkgs/by-name/me/mepo/package.nix +++ b/pkgs/by-name/me/mepo/package.nix @@ -8,33 +8,33 @@ SDL2_ttf, busybox, curl, - findutils, geoclue2-with-demo-agent, gpsd, jq, makeWrapper, + mobroute, ncurses, pkg-config, util-linux, xwininfo, zenity, - zig_0_12, + zig_0_13, }: stdenv.mkDerivation (finalAttrs: { pname = "mepo"; - version = "1.2.1"; + version = "1.3.3"; src = fetchFromSourcehut { owner = "~mil"; repo = "mepo"; rev = finalAttrs.version; - hash = "sha256-Ii5E9TgUxzlVIdkKS/6RtasOETeclMm1yoU86gs4hB8="; + hash = "sha256-hEsQpTrj2WCoRgNWdhcUnQRzhI/6BydcbG9kRePstgg="; }; nativeBuildInputs = [ pkg-config - zig_0_12.hook + zig_0_13.hook makeWrapper ]; @@ -51,8 +51,8 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; postInstall = '' - install -d $out/share/man/man1 - $out/bin/mepo -docman > $out/share/man/man1/mepo.1 + install -d $out/share/doc/mepo + $out/bin/mepo -docmd > $out/share/doc/mepo/documentation.md ''; postFixup = '' @@ -67,9 +67,9 @@ stdenv.mkDerivation (finalAttrs: { lib.makeBinPath ([ busybox curl - findutils gpsd jq + mobroute ncurses util-linux xwininfo @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - homepage = "https://mepo.milesalan.com"; + homepage = "https://mepo.lrdu.org"; description = "Fast, simple, and hackable OSM map viewer"; longDescription = '' Mepo is a fast, simple, and hackable OSM map viewer for desktop & mobile @@ -90,9 +90,9 @@ stdenv.mkDerivation (finalAttrs: { desktop X, and desktop Wayland. Mepo works both offline and online, features a minimalist both touch/mouse and keyboard compatible interface, and offers a UNIX-philosophy inspired underlying design, exposing a - powerful command language called Mepolang capable of being scripted to - provide things like custom bounding-box search scripts, bookmarks, and - more. + powerful JSON API to allow the user to change & add functionality + such as adding their own search & routing scripts, + add arbitrary buttons/keybindings to the UI, and more. ''; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ From fbf4124ab58c42effcbdd928d8c1aa14fd0c167d Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Mon, 17 Feb 2025 22:08:22 -0800 Subject: [PATCH 47/53] llvmPackages_git: 21.0.0-unstable-2025-02-10 -> 21.0.0-unstable-2025-02-17 --- pkgs/development/compilers/llvm/common/default.nix | 2 +- pkgs/development/compilers/llvm/default.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 116d7c6406e4..5a108a4442ff 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -501,7 +501,7 @@ let }) ] ++ - lib.optional (lib.versionAtLeast metadata.release_version "20") + lib.optional (lib.versions.major metadata.release_version == "20") # Fix OrcJIT tests with page sizes > 16k # PR: https://github.com/llvm/llvm-project/pull/127115 ( diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 68730c5c96d9..efedb085e94e 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -32,9 +32,9 @@ let "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; "20.1.0-rc2".officialRelease.sha256 = "sha256-lBx+MWfYBM6XSJozacALMGlo0DUUWqnsBQyO8lDljSo="; "21.0.0-git".gitRelease = { - rev = "c9f1d2cbf18990311ea1287cc154e3784a10a3b0"; - rev-version = "21.0.0-unstable-2025-02-10"; - sha256 = "sha256-ggH32zM85geN0c0LPLBv7VAObi67AxPlTJ4YgbT4s7M="; + rev = "ef9f0b3c414a5d55e694829514d7b2ff8736d3c3"; + rev-version = "21.0.0-unstable-2025-02-17"; + sha256 = "sha256-EpMIADP2aIY68Ys1/Sl6hg1ew0An9ik0c17anxBEl1w="; }; } // llvmVersions; From 1606ea91b440f6cde658ee101ac47eff231a336b Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Wed, 12 Feb 2025 09:04:17 +0100 Subject: [PATCH 48/53] nixos-generate-config: add --flake option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: éclairevoyant <848000+eclairevoyant@users.noreply.github.com> --- .../manual/installation/installing.chapter.md | 11 +++++ .../manual/release-notes/rl-2505.section.md | 2 + .../tools/manpages/nixos-generate-config.8 | 10 ++++- .../installer/tools/nixos-generate-config.pl | 17 ++++++++ nixos/modules/installer/tools/tools.nix | 42 +++++++++++++++++-- nixos/tests/nixos-generate-config.nix | 6 +++ 6 files changed, 84 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/installation/installing.chapter.md b/nixos/doc/manual/installation/installing.chapter.md index 5322e9f5e598..8ee417a108fd 100644 --- a/nixos/doc/manual/installation/installing.chapter.md +++ b/nixos/doc/manual/installation/installing.chapter.md @@ -398,6 +398,9 @@ Use the following commands: [](#ch-options). A minimal example is shown in [Example: NixOS Configuration](#ex-config). + This command accepts an optional `--flake` option, to also generate a + `flake.nix` file, if you want to set up a flake-based configuration. + The command `nixos-generate-config` can generate an initial configuration file for you: @@ -490,6 +493,14 @@ Use the following commands: from the NixOS binary cache), you can re-run `nixos-install` after fixing your `configuration.nix`. + If you opted for a flake-based configuration, you will need to pass the + `--flake` here as well and specify the name of the configuration as used in + the `flake.nix` file. For the default generated flake, this is `nixos`. + + ```ShellSession + # nixos-install --flake 'path/to/flake.nix#nixos' + ``` + As the last step, `nixos-install` will ask you to set the password for the `root` user, e.g. diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index ba79250c9d77..03e4458ec50c 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -28,6 +28,8 @@ - `nixos-rebuild-ng`, a full rewrite of `nixos-rebuild` in Python, is available for testing. You can enable it by setting [system.rebuild.enableNg](options.html#opt-system.rebuild.enableNg) in your configuration (this will replace the old `nixos-rebuild`), or by adding `nixos-rebuild-ng` to your `environment.systemPackages` (in this case, it will live side-by-side with `nixos-rebuild` as `nixos-rebuild-ng`). It is expected that the next major version of NixOS (25.11) will enable `system.rebuild.enableNg` by default. +- The `nixos-generate-config` command now supports a optional `--flake` option, which will generate a flake.nix file alongside the `configuration.nix` and `hardware-configuration.nix`, providing an easy instroduction into flake-based system configurations. + - A `nixos-rebuild build-image` sub-command has been added. It allows users to build platform-specific (disk) images from their NixOS configurations. `nixos-rebuild build-image` works similar to the popular [nix-community/nixos-generators](https://github.com/nix-community/nixos-generators) project. See new [section on image building in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-image-nixos-rebuild-build-image). It is also available for `nixos-rebuild-ng`. diff --git a/nixos/modules/installer/tools/manpages/nixos-generate-config.8 b/nixos/modules/installer/tools/manpages/nixos-generate-config.8 index 1b95599e156a..33afcc2d3b02 100644 --- a/nixos/modules/installer/tools/manpages/nixos-generate-config.8 +++ b/nixos/modules/installer/tools/manpages/nixos-generate-config.8 @@ -12,6 +12,7 @@ .Op Fl -force .Op Fl -root Ar root .Op Fl -dir Ar dir +.Op Fl -flake . . . @@ -68,7 +69,14 @@ instead of .It Fl -force Overwrite .Pa /etc/nixos/configuration.nix -if it already exists. +(and +.Pa /etc/nixos/flake.nix +if --flake is passed) if already present. +. +.It Fl -flake +Also generate +.Pa /etc/nixos/flake.nix Ns +\&. . .It Fl -no-filesystems Omit everything concerning file systems and swap devices from the hardware configuration. diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index cf4173638b1a..10ff1aeafd05 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -35,6 +35,7 @@ my $outDir = "/etc/nixos"; my $rootDir = ""; # = / my $force = 0; my $noFilesystems = 0; +my $flake = 0; my $showHardwareConfig = 0; for (my $n = 0; $n < scalar @ARGV; $n++) { @@ -64,6 +65,9 @@ for (my $n = 0; $n < scalar @ARGV; $n++) { elsif ($arg eq "--show-hardware-config") { $showHardwareConfig = 1; } + elsif ($arg eq "--flake") { + $flake = 1; + } else { die "$0: unrecognized argument ‘$arg’\n"; } @@ -661,6 +665,19 @@ if ($showHardwareConfig) { mkpath($outDir, 0, 0755); write_file($fn, $hwConfig); + $fn = "$outDir/flake.nix"; + if ($flake) { + if ($force || ! -e $fn) { + print STDERR "writing $fn...\n"; + mkpath($outDir, 0, 0755); + write_file($fn, < Date: Tue, 18 Feb 2025 09:58:57 +0100 Subject: [PATCH 49/53] python312Packages.meshio: skip failing tests --- .../python-modules/meshio/default.nix | 102 ++++++++++++++---- 1 file changed, 84 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/meshio/default.nix b/pkgs/development/python-modules/meshio/default.nix index 6e9904267ece..a019a48e8526 100644 --- a/pkgs/development/python-modules/meshio/default.nix +++ b/pkgs/development/python-modules/meshio/default.nix @@ -1,47 +1,113 @@ { lib, buildPythonPackage, - fetchPypi, - numpy, - netcdf4, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies h5py, + netcdf4, + numpy, + rich, + + # tests exdown, pytestCheckHook, - rich, - setuptools, }: buildPythonPackage rec { pname = "meshio"; version = "5.3.5"; - format = "pyproject"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-8h8Bq9nym6BuoRkwSz055hBCHP6Tud0jNig0kZ+HWG0="; + src = fetchFromGitHub { + owner = "nschloe"; + repo = "meshio"; + tag = "v${version}"; + hash = "sha256-2j+5BYftCiy+g33UbsgCMWBRggGBJBx5VoEdSqQ/mV0="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - numpy - netcdf4 + dependencies = [ h5py + netcdf4 + numpy rich ]; + pythonImportsCheck = [ "meshio" ]; + nativeCheckInputs = [ exdown pytestCheckHook ]; - pythonImportsCheck = [ "meshio" ]; + disabledTests = [ + # RuntimeError: Not a valid Netgen mesh + "test_advanced" - meta = with lib; { - homepage = "https://github.com/nschloe/meshio"; + # ValueError: cannot reshape array of size 12 into shape (1936876918,3) + "test_area" + + # Error: Couldn't read file /build/source/tests/meshes/vtk/06_color_scalars.vtk as vtk + # Illegal VTK header + "test_color_scalars" + "test_pathlike" + + # AssertionError + "test_comma_space" + + # ValueError: could not convert string to float: 'np.float64(63.69616873214543)' + "test_dolfin" + + # ValueError: cannot reshape array of size 1 into shape + "test_gmsh22" + "test_gmsh40" + "test_gmsh41" + + # meshio._exceptions.ReadError: Header of ugrid file is ill-formed + "test_io" + "test_volume" + + # ValueError: invalid literal for int() with base 10: 'version' + "test_point_cell_refs" + + # Error: Couldn't read file /build/source/tests/meshes/vtu/01_raw_binary_int64.vtu as vtu + "test_read_from_file" + + # ValueError: cannot reshape array of size 12 into shape (1936876918,3) + # -- or + # Error: Couldn't read file /build/source/tests/meshes/medit/hch_strct.4.meshb as medit + # Invalid code + # -- or + # AssertionError + # -- or + # Error: Couldn't read file /build/source/tests/meshes/msh/insulated-2.2.msh as either of ansys, gmsh + "test_reference_file" + + # UnboundLocalError: cannot access local variable 'points' where it is not associated with a value + # -- or + # Error: Couldn't read file /build/source/tests/meshes/vtk/00_image.vtk as vtk + # Illegal VTK header + "test_structured" + + # Error: Couldn't read file /build/source/tests/meshes/ply/bun_zipper_res4.ply as ply + # Expected ply + "test_read_pathlike" + "test_read_str" + "test_write_pathlike" + "test_write_str" + ]; + + meta = { description = "I/O for mesh files"; + homepage = "https://github.com/nschloe/meshio"; + changelog = "https://github.com/nschloe/meshio/blob/v${version}/CHANGELOG.md"; mainProgram = "meshio"; - license = licenses.mit; - maintainers = with maintainers; [ wd15 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ wd15 ]; }; } From 431c997cd80994be3b8ad9de7e96ca7203b67557 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 18 Feb 2025 10:02:58 +0100 Subject: [PATCH 50/53] open-webui: 0.5.12 -> 0.5.14 changelogs: - https://github.com/open-webui/open-webui/releases/tag/v0.5.14 - https://github.com/open-webui/open-webui/releases/tag/v0.5.13 diff: - https://github.com/open-webui/open-webui/compare/v0.5.12..v0.5.14 --- pkgs/by-name/op/open-webui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix index adcb569d4f04..754412d5a447 100644 --- a/pkgs/by-name/op/open-webui/package.nix +++ b/pkgs/by-name/op/open-webui/package.nix @@ -7,19 +7,19 @@ }: let pname = "open-webui"; - version = "0.5.12"; + version = "0.5.14"; src = fetchFromGitHub { owner = "open-webui"; repo = "open-webui"; tag = "v${version}"; - hash = "sha256-+Hg4tyfmgfh3k/pUKMjs7IRahPV2/LRUDj1kt2g45Dw="; + hash = "sha256-+5XlQ3gxrM9ooNrgQpcFDnCvCdXsisfR9Jq9tvlvUQQ="; }; frontend = buildNpmPackage { inherit pname version src; - npmDepsHash = "sha256-pM8Ie3kkjVq9OJHKpGLQ1E/omd84B0N8lXAHKxUa8/4="; + npmDepsHash = "sha256-jLysRVrsK0e3YfADVAnjpKXWlZhkoxPU//ttzBxnxgY="; # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` # Until this is solved, running python packages from the browser will not work. From e21466f5e21f9f99b699157b4afd11992e9e0529 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 18 Feb 2025 10:02:09 +0100 Subject: [PATCH 51/53] python312Packages.sfepy: 2024.1 -> 2024.4 Diff: https://github.com/sfepy/sfepy/compare/release_2024.1...release_2024.4 --- .../python-modules/sfepy/default.nix | 94 ++++++++++++------- 1 file changed, 62 insertions(+), 32 deletions(-) diff --git a/pkgs/development/python-modules/sfepy/default.nix b/pkgs/development/python-modules/sfepy/default.nix index 599e853e5f72..3c782a874b67 100644 --- a/pkgs/development/python-modules/sfepy/default.nix +++ b/pkgs/development/python-modules/sfepy/default.nix @@ -1,41 +1,73 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, + writableTmpDirAsHomeHook, + + # build-system cmake, cython_0, ninja, oldest-supported-numpy, setuptools, scikit-build, - numpy, - scipy, + + # dependencies matplotlib, - pyparsing, - tables, - python, - sympy, meshio, - openssh, + numpy, + pyparsing, + python, pyvista, + scipy, + sympy, + tables, + + # tests pytest, + openssh, }: buildPythonPackage rec { pname = "sfepy"; - version = "2024.1"; + version = "2024.4"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "sfepy"; repo = "sfepy"; - rev = "release_${version}"; - hash = "sha256-r2Qx9uJmVS4ugJxrIxg2UscnYu1Qr4hEkcz66NyWGmA="; + tag = "release_${version}"; + hash = "sha256-3XQqPoAM1Qw/fZ649Xk+ceaeBkZ3ypI1FSRxtYbIrxw="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "ninja<=1.11.1.1" "ninja" \ + --replace-fail "numpy<2" "numpy" + + substituteInPlace sfepy/solvers/optimize.py \ + --replace-fail "nm.Inf" "nm.inf" + + substituteInPlace sfepy/examples/quantum/quantum_common.py \ + --replace-fail "NaN" "nan" + + # slow tests + rm sfepy/tests/test_elasticity_small_strain.py + rm sfepy/tests/test_hyperelastic_tlul.py + rm sfepy/tests/test_io.py + rm sfepy/tests/test_linear_solvers.py + rm sfepy/tests/test_poly_spaces.py + rm sfepy/tests/test_quadratures.py + rm sfepy/tests/test_refine_hanging.py + rm sfepy/tests/test_term_call_modes.py + # ValueError: invalid literal for int() with base 10: 'np.int64(3)' + rm sfepy/tests/test_meshio.py + ''; + + nativeBuildInputs = [ + writableTmpDirAsHomeHook + ]; + build-system = [ cmake cython_0 @@ -48,37 +80,35 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; dependencies = [ - numpy - scipy matplotlib - pyparsing - tables - sympy meshio + numpy + pyparsing pyvista + scipy + sympy + tables ]; - postPatch = '' - # slow tests - rm sfepy/tests/test_io.py - rm sfepy/tests/test_elasticity_small_strain.py - rm sfepy/tests/test_term_call_modes.py - rm sfepy/tests/test_refine_hanging.py - rm sfepy/tests/test_hyperelastic_tlul.py - rm sfepy/tests/test_poly_spaces.py - rm sfepy/tests/test_linear_solvers.py - rm sfepy/tests/test_quadratures.py - ''; + pythonRelaxDeps = [ + "numpy" + ]; - nativeCheckInputs = [ pytest ]; + nativeCheckInputs = [ + pytest + writableTmpDirAsHomeHook + ]; checkPhase = '' - export OMPI_MCA_plm_rsh_agent=${openssh}/bin/ssh - export HOME=$TMPDIR + runHook preCheck + + export OMPI_MCA_plm_rsh_agent=${lib.getExe openssh} mv sfepy sfepy.hidden mkdir -p $HOME/.matplotlib echo "backend: ps" > $HOME/.matplotlib/matplotlibrc ${python.interpreter} -c "import sfepy; sfepy.test()" + + runHook postCheck ''; meta = { From 5687ba6bd6fd7031bc45d9a425c6e30a25886fcb Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 18 Feb 2025 10:15:26 +0100 Subject: [PATCH 52/53] python312Packages.hankel: skip failing test --- .../development/python-modules/hankel/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/hankel/default.nix b/pkgs/development/python-modules/hankel/default.nix index fce947a64141..b46264f190bd 100644 --- a/pkgs/development/python-modules/hankel/default.nix +++ b/pkgs/development/python-modules/hankel/default.nix @@ -2,11 +2,17 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system setuptools, setuptools-scm, + + # dependencies mpmath, numpy, scipy, + + # tests pytestCheckHook, pytest-xdist, }: @@ -27,6 +33,7 @@ buildPythonPackage rec { setuptools setuptools-scm ]; + dependencies = [ mpmath numpy @@ -34,15 +41,21 @@ buildPythonPackage rec { ]; pythonImportsCheck = [ "hankel" ]; + nativeCheckInputs = [ pytestCheckHook pytest-xdist ]; + disabledTests = [ + # ValueError: Calling nonzero on 0d arrays is not allowed. + "test_nu0" + ]; + meta = { description = "Implementation of Ogata's (2005) method for Hankel transforms"; homepage = "https://github.com/steven-murray/hankel"; - changelog = "https://github.com/steven-murray/hankel/${src.rev}/CHANGELOG.rst"; + changelog = "https://github.com/steven-murray/hankel/v${version}/CHANGELOG.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sigmanificient ]; }; From e1e97eb52f233b84f8f0a5484c0dee0e97c9ace3 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 18 Feb 2025 10:12:00 +0100 Subject: [PATCH 53/53] python312Packages.gstools: 1.6.0 -> 1.6.1 Diff: https://github.com/GeoStat-Framework/GSTools/compare/refs/tags/v1.6.0...v1.6.1 Changelog: https://github.com/GeoStat-Framework/GSTools/blob/refs/tags/v1.6.1/CHANGELOG.md --- .../python-modules/gstools/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/gstools/default.nix b/pkgs/development/python-modules/gstools/default.nix index 6c0f24eb2385..73e748056632 100644 --- a/pkgs/development/python-modules/gstools/default.nix +++ b/pkgs/development/python-modules/gstools/default.nix @@ -2,37 +2,43 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools, - setuptools-scm, - numpy, + + # build-system cython, extension-helpers, + numpy, + setuptools, + setuptools-scm, + + # dependencies hankel, emcee, meshio, pyevtk, scipy, + + # tests pytestCheckHook, }: buildPythonPackage rec { pname = "gstools"; - version = "1.6.0"; + version = "1.6.1"; pyproject = true; src = fetchFromGitHub { owner = "GeoStat-Framework"; repo = "GSTools"; tag = "v${version}"; - hash = "sha256-QpdOARzcSRVFl/DbnE2JLBFZmTSh/fBOmzweuf+zfEs="; + hash = "sha256-Aieuk0Xjlut8rTZoFHcBpPtyIj/fstMrHiiKyDOpQlg="; }; build-system = [ - setuptools - setuptools-scm - numpy cython extension-helpers + numpy + setuptools + setuptools-scm ]; dependencies = [ @@ -50,7 +56,7 @@ buildPythonPackage rec { meta = { description = "Geostatistical toolbox"; homepage = "https://github.com/GeoStat-Framework/GSTools"; - changelog = "https://github.com/GeoStat-Framework/GSTools/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/GeoStat-Framework/GSTools/blob/v${version}/CHANGELOG.md"; license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ sigmanificient ]; };